aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/amr/amr_disk.c
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2004-02-22 10:00:05 +0000
committerColin Percival <cperciva@FreeBSD.org>2004-02-22 10:00:05 +0000
commit9a6caa1afca201d2bc7aedd35bc7bf69e8a73116 (patch)
tree6929ff327410f9f656467651c9d16687219798b6 /sys/dev/amr/amr_disk.c
parentcd8aaf212102bdad98092dfbe89be33c3bfca9e0 (diff)
downloadsrc-9a6caa1afca201d2bc7aedd35bc7bf69e8a73116.tar.gz
src-9a6caa1afca201d2bc7aedd35bc7bf69e8a73116.zip
Check that amrd_sc is non-NULL before dereferencing it, not after.
Reported by: "Ted Unangst" <tedu@coverity.com> Approved by: rwatson (mentor)
Notes
Notes: svn path=/head/; revision=126116
Diffstat (limited to 'sys/dev/amr/amr_disk.c')
-rw-r--r--sys/dev/amr/amr_disk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index a93e1edd0f9e..fef49190f69a 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -157,9 +157,9 @@ amrd_dump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t l
dp = arg;
amrd_sc = (struct amrd_softc *)dp->d_drv1;
- amr_sc = (struct amr_softc *)amrd_sc->amrd_controller;
- if (!amrd_sc || !amr_sc)
+ if (amrd_sc == NULL)
return(ENXIO);
+ amr_sc = (struct amr_softc *)amrd_sc->amrd_controller;
if (length > 0) {
int driveno = amrd_sc->amrd_drive - amr_sc->amr_drive;