From owner-svn-src-head@freebsd.org  Wed Sep 13 14:27:14 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 F2D12E23AE4;
 Wed, 13 Sep 2017 14:27:14 +0000 (UTC)
 (envelope-from tsoome@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 C1DB766BB9;
 Wed, 13 Sep 2017 14:27:14 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8DERDrC056516;
 Wed, 13 Sep 2017 14:27:13 GMT (envelope-from tsoome@FreeBSD.org)
Received: (from tsoome@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8DERD58056515;
 Wed, 13 Sep 2017 14:27:13 GMT (envelope-from tsoome@FreeBSD.org)
Message-Id: <201709131427.v8DERD58056515@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tsoome set sender to
 tsoome@FreeBSD.org using -f
From: Toomas Soome <tsoome@FreeBSD.org>
Date: Wed, 13 Sep 2017 14:27:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r323541 - head/sys/boot/efi/libefi
X-SVN-Group: head
X-SVN-Commit-Author: tsoome
X-SVN-Commit-Paths: head/sys/boot/efi/libefi
X-SVN-Commit-Revision: 323541
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Sep 2017 14:27:15 -0000

Author: tsoome
Date: Wed Sep 13 14:27:13 2017
New Revision: 323541
URL: https://svnweb.freebsd.org/changeset/base/323541

Log:
  libefi: efipart_realstrategy rsize pointer may be NULL
  
  Need to check rsize before dereferencing it.

Modified:
  head/sys/boot/efi/libefi/efipart.c

Modified: head/sys/boot/efi/libefi/efipart.c
==============================================================================
--- head/sys/boot/efi/libefi/efipart.c	Wed Sep 13 13:03:29 2017	(r323540)
+++ head/sys/boot/efi/libefi/efipart.c	Wed Sep 13 14:27:13 2017	(r323541)
@@ -924,7 +924,8 @@ efipart_realstrategy(void *devdata, int rw, daddr_t bl
 		readstart = off / blkio->Media->BlockSize;
 
 		if (diskend <= readstart) {
-			*rsize = 0;
+			if (rsize != NULL)
+				*rsize = 0;
 
 			return (EIO);
 		}