From owner-svn-src-stable@freebsd.org  Wed Sep  7 13:57:07 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 80A38BC799E;
 Wed,  7 Sep 2016 13:57:07 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4396BF16;
 Wed,  7 Sep 2016 13:57:07 +0000 (UTC)
 (envelope-from andrew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u87Dv6EJ009914;
 Wed, 7 Sep 2016 13:57:06 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u87Dv6Zd009913;
 Wed, 7 Sep 2016 13:57:06 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201609071357.u87Dv6Zd009913@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 7 Sep 2016 13:57:06 +0000 (UTC)
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
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Sep 2016 13:57:07 -0000

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