svn commit: r304801 - head/sys/boot/efi/loader

[Andrew Turner]

Author: andrew
Date: Thu Aug 25 12:42:41 2016
New Revision: 304801
URL: https://svnweb.freebsd.org/changeset/base/304801

Log:
  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
  MFC after:	1 week
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/boot/efi/loader/devicename.c

Modified: head/sys/boot/efi/loader/devicename.c
==============================================================================
--- head/sys/boot/efi/loader/devicename.c	Thu Aug 25 12:04:57 2016	(r304800)
+++ head/sys/boot/efi/loader/devicename.c	Thu Aug 25 12:42:41 2016	(r304801)
@@ -120,7 +120,6 @@ efi_parsedev(struct devdesc **dev, const
 			free(idev);
 			return (err);
 		}
-		*dev = idev;
 		cp = strchr(np + 1, ':');
 	} else
 #endif