From owner-svn-src-all@freebsd.org  Wed Feb  5 11:02:01 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 793FF2474EC;
 Wed,  5 Feb 2020 11:02:01 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48CJY52gm5z4PMp;
 Wed,  5 Feb 2020 11:02:01 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 573BE199A;
 Wed,  5 Feb 2020 11:02:01 +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 015B21N0025815;
 Wed, 5 Feb 2020 11:02:01 GMT (envelope-from tsoome@FreeBSD.org)
Received: (from tsoome@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 015B21wp025814;
 Wed, 5 Feb 2020 11:02:01 GMT (envelope-from tsoome@FreeBSD.org)
Message-Id: <202002051102.015B21wp025814@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, 5 Feb 2020 11:02:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r357569 - head/stand/i386/zfsboot
X-SVN-Group: head
X-SVN-Commit-Author: tsoome
X-SVN-Commit-Paths: head/stand/i386/zfsboot
X-SVN-Commit-Revision: 357569
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Feb 2020 11:02:01 -0000

Author: tsoome
Date: Wed Feb  5 11:02:00 2020
New Revision: 357569
URL: https://svnweb.freebsd.org/changeset/base/357569

Log:
  zfsboot: vdev_read_pad2 does allocate buffer with wrong size
  
  vdev_read_pad2() does read VDEV_PAD_SIZE of data, and will copy size bytes
  of it, hence, we need buffer of VDEV_PAD_SIZE bytes.
  
  Issue introduced in r357497.
  
  Reported by:	se

Modified:
  head/stand/i386/zfsboot/zfsboot.c

Modified: head/stand/i386/zfsboot/zfsboot.c
==============================================================================
--- head/stand/i386/zfsboot/zfsboot.c	Wed Feb  5 08:55:19 2020	(r357568)
+++ head/stand/i386/zfsboot/zfsboot.c	Wed Feb  5 11:02:00 2020	(r357569)
@@ -324,7 +324,7 @@ vdev_read_pad2(vdev_t *vdev, char *buf, size_t size)
 	if (size > VDEV_PAD_SIZE)
 		size = VDEV_PAD_SIZE;
 
-	tmp = malloc(size);
+	tmp = malloc(VDEV_PAD_SIZE);
 	if (tmp == NULL)
 		return (ENOMEM);