From nobody Sun Nov 28 02:05:55 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 428C718B3063; Sun, 28 Nov 2021 02:05:56 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J1sJz5KfKz3H2b; Sun, 28 Nov 2021 02:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8140B26916; Sun, 28 Nov 2021 02:05:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AS25tNw054881; Sun, 28 Nov 2021 02:05:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AS25t72054880; Sun, 28 Nov 2021 02:05:55 GMT (envelope-from git) Date: Sun, 28 Nov 2021 02:05:55 GMT Message-Id: <202111280205.1AS25t72054880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2104a8064951 - stable/13 - mkimg: zero entry in vhdx_write_metadata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2104a806495173c399ca2709533ab0ab48b708b3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638065155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xQQisqtiNNSe4uf8We7Kdxt2jgcmhn8aPGz9vmv8iWc=; b=yAKHwI6mByLtmRtAn1kpfKolVvBXONq84nfMe7AxdeuwDtyF2VCELEq9l8lQtpY2Dy8l5G TthcuJvNQ5Sc9OHmnQPcHXRex/HU+RJopeAYjpJGJONH3BSUNAKz61peEqRUK5UZ7SMJOJ AQn3QCrNIwcN7uUnCVGxlz67ytJ0sl3S+HszDGIpIi+4hwxbBC3N/qov+LSRyzmNyryBQ0 YvU9meHW3lJM01RAxPB5Eq9NwsBmKS+WA+PFxwBvk2tCvShDEnX7cg1Ew5N/2AayuENxEM 4ovNsbzDc7wGKwmVGpu0gMODB2FDYThX6poXxzify1jvQBflLPbmiXmOaAPKpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638065155; a=rsa-sha256; cv=none; b=O5ZNfezUwUmN1ylE5HAKOHofLSxZcgsI1P3Z30P0DkiPP08VJ6lVxacQipVxiPY125NMfs o4srCSGSfdt80n8FSTEC3V6/yM26XiPpd0avWa4Tn/MdqlW45nvFo40p17xEJllss7Upzk ZRgswMG8v1VxHM9jUpvSy2bZjoVGXhkl4LxpJBjdQgicb4pT4lUfvcieItG15xaSuYCeaQ 70y0fUH5Q8gK9JJpI2LwsXhzaLiEScVvh9SG/q8yiV2SahhY+bHMwm9NRtSDlFaJKXCEcD 6FWQTFrJflx0BugK16NIGbiTN17XM88F3KgboEAazls++FHKI5IPX+uw6mvu/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2104a806495173c399ca2709533ab0ab48b708b3 commit 2104a806495173c399ca2709533ab0ab48b708b3 Author: Ed Maste AuthorDate: 2021-11-21 00:29:11 +0000 Commit: Ed Maste CommitDate: 2021-11-28 00:29:30 +0000 mkimg: zero entry in vhdx_write_metadata Otherwise _reserved might contain uninitialized data. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 036af1053acd6cae68c5fb6bed30508f2e40be13) --- usr.bin/mkimg/vhdx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/mkimg/vhdx.c b/usr.bin/mkimg/vhdx.c index 4c97b20f5996..744d6e810ca5 100644 --- a/usr.bin/mkimg/vhdx.c +++ b/usr.bin/mkimg/vhdx.c @@ -331,6 +331,7 @@ vhdx_write_metadata(int fd, uint64_t image_size) memset(metadata, 0, SIZE_1MB); memset(&header, 0, sizeof(header)); + memset(&entry, 0, sizeof(entry)); le64enc(&header.signature, VHDX_METADATA_TABLE_HEADER_SIGNATURE); le16enc(&header.entry_count, 5);