From nobody Sun Nov 28 02:56:13 2021 X-Original-To: dev-commits-src-branches@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 7BDED18B1C15; Sun, 28 Nov 2021 02:56:14 +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 4J1tR15djNz3mfP; Sun, 28 Nov 2021 02:56:13 +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 4E94A273A4; Sun, 28 Nov 2021 02:56:13 +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 1AS2uDfi020367; Sun, 28 Nov 2021 02:56:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AS2uDro020366; Sun, 28 Nov 2021 02:56:13 GMT (envelope-from git) Date: Sun, 28 Nov 2021 02:56:13 GMT Message-Id: <202111280256.1AS2uDro020366@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: 38cb3cac475c - stable/12 - mkimg: zero entry in vhdx_write_metadata List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 38cb3cac475c70b7c9e71fb13d48fbdce40f52fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638068173; 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=xBUt3Q/BuNv1IzomILBDly0BVf87Y00tULq+nqh9bqA=; b=W8z3M7stWkEvUYKfcm5MLU/lB+Yg+dsVRaj9/zaw0qgytxtam4P1fDnxWyAMZEIoW5wX4M c+zRh9oqdr21sh+Ru49UgRZPMleqPiY3GuJydb+q6238bUaQbDcfWMGUnUZV7ZnaTqWqQ5 8YtCM0VIB4UZlJ6umZMdN/npcRQNuJScT4CsJVlLaBGND0BPeg9oyBKKjmBNQrm9HsrTb+ xSozyGRduZk9hZVmDHfI337f9eJ82JMUxkFEZaIDc8+EmXThvazAot+cxZBmxILZs9PC/M WbWeDfX72W3JDgEakoF0lwUGtko9LFSTwJyGfg32APf2jkKJo2xWAyfS1/z0Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638068173; a=rsa-sha256; cv=none; b=KMbh7G9K5P5Owgon9U1pxh5Z/dc24VAneTGGQQ7CzWo8dnGGWabbvc5x7N8R5nFZjLqL7u n4N/4r45rKsSxmHm/rxtECzxUT/ZBSg1TL9NOFM4MPp/IXW20HIteJxww/JAvTDFuAafPA w778T5iSJHPCr1BjSRs3XC6FZVse03JQkhFEuymSsZ0SYHpmDWsDD8p8XwWin6fdhVIiQB Ex5IcX3WT63chAA62sqcq0G2Ukb1AbhkoDKGTdmwWAIsrZz7OWxECi9dya7t2nrSyQMiiH zGgHQLGZC1JkbP0c7rxXvtq19lzTJ/8zIgNvsFxI2m+STnnWmHei+xfT4QwFDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=38cb3cac475c70b7c9e71fb13d48fbdce40f52fd commit 38cb3cac475c70b7c9e71fb13d48fbdce40f52fd Author: Ed Maste AuthorDate: 2021-11-21 00:29:11 +0000 Commit: Ed Maste CommitDate: 2021-11-28 02:55:46 +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);