Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Sep 2016 13:57:06 +0000 (UTC)
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r305537 - stable/11/sys/boot/efi/loader
Message-ID:  <201609071357.u87Dv6Zd009913@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: andrew
Date: Wed Sep  7 13:57:06 2016
New Revision: 305537
URL: https://svnweb.freebsd.org/changeset/base/305537

Log:
  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

Modified:
  stable/11/sys/boot/efi/loader/devicename.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/boot/efi/loader/devicename.c
==============================================================================
--- stable/11/sys/boot/efi/loader/devicename.c	Wed Sep  7 13:51:34 2016	(r305536)
+++ stable/11/sys/boot/efi/loader/devicename.c	Wed Sep  7 13:57:06 2016	(r305537)
@@ -120,7 +120,6 @@ efi_parsedev(struct devdesc **dev, const
 			free(idev);
 			return (err);
 		}
-		*dev = idev;
 		cp = strchr(np + 1, ':');
 	} else
 #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609071357.u87Dv6Zd009913>