summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorandrew <andrew@FreeBSD.org>2016-09-07 13:57:06 +0000
committerandrew <andrew@FreeBSD.org>2016-09-07 13:57:06 +0000
commit889d4f798b14219a60729bebb04799ddcdba4071 (patch)
treea9c98fcc2c6de70ce32e9a229f4e7bcc32acfd71 /sys/boot
parentef36d30f012060480b9012d649b1cfbeeb1d3890 (diff)
downloadFreeBSD-src-889d4f798b14219a60729bebb04799ddcdba4071.zip
FreeBSD-src-889d4f798b14219a60729bebb04799ddcdba4071.tar.gz
MFC 304801:
Don't set *dev in the zfs root case, it may be NULL and will correctly be set later in the function. This fixes a potential NULL pointer dereference found on arm64. Obtained from: ABT Systems Ltd Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/efi/loader/devicename.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/boot/efi/loader/devicename.c b/sys/boot/efi/loader/devicename.c
index 8fc80eb..64a417d 100644
--- a/sys/boot/efi/loader/devicename.c
+++ b/sys/boot/efi/loader/devicename.c
@@ -120,7 +120,6 @@ efi_parsedev(struct devdesc **dev, const char *devspec, const char **path)
free(idev);
return (err);
}
- *dev = idev;
cp = strchr(np + 1, ':');
} else
#endif
OpenPOWER on IntegriCloud