From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1klu3e-0005R0-PU for mharc-grub-devel@gnu.org; Sun, 06 Dec 2020 08:26:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klu3Z-0005QL-Ex for grub-devel@gnu.org; Sun, 06 Dec 2020 08:26:31 -0500 Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:50009) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klu3X-0002JM-RJ for grub-devel@gnu.org; Sun, 06 Dec 2020 08:26:29 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 4CAB8984; Sun, 6 Dec 2020 08:26:26 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sun, 06 Dec 2020 08:26:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm2; bh=kJCd1x27YM7aR/ycyEl6uYlU+6/ l9PKkXHqns6EIUHk=; b=PgFNawPU+RNUVaGzKn9abszHM//qEYPVUzTvDfKrxp3 YCHVi7zkZhVMRUmLXdngS2JTQ9dD4gnbc0socWOc1JUTDGsh0XzdToAHmsVEu6B2 KEGDwKKr+dCFIuSo8iHetEodi4VC2j1FxvhlizX1oP6fjzZCw7nnd9D4t2hrXM28 F3jqRY2VHh0ia6kEN9woSgKRso3TZBDV+5SDjJk1YPZhNcAM/xIcuqHrEG/NfvKl 4xCVNVwhsQ4S5JaQ9Es+H655SEmk3o4hSrpKBWo8SB9NjvEIbURNMYsyghCsJSQ3 FTBVEuAwJhRJXO2YvNFJGxALB28OgbgqzwVGf872QfQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=kJCd1x 27YM7aR/ycyEl6uYlU+6/l9PKkXHqns6EIUHk=; b=oSOeapanV7QmAmnuBj2/lo T8Dr4rlRVQOlMjQeHAo0wew3pP00UESkwtEHur6g6jYjs8tKpq2rV3Qy0491+y7p s9E3akOxL9Xckzz6WHzzIGCtqi1H9LSEpPG11Inv28HV33ydkpZSedHOONOjzQHT xvjxkjGnQg5rwLf1gQhkUn8FKKuLeIKLOk7wagEQhpAuRDq8CQJMaDp7AxZ8Op80 AnEvpooJA2GXmra3e0nDXR3LwZ1lQShxmdfyLbvD1G5TKVX/8vgX1qaEQeV39XXx Zqoc6OhyjdoggdY59EFqah0TBU6tXnEipWNEyNsfA80cHF740FKCscyFlkiQjVwg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejvddgheefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeejrddukeefrddujedruddutdenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Received: from vm-mail (x4db7116e.dyn.telefonica.de [77.183.17.110]) by mail.messagingengine.com (Postfix) with ESMTPA id 64BD4240059; Sun, 6 Dec 2020 08:26:24 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id f336ef68 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 6 Dec 2020 13:26:22 +0000 (UTC) Date: Sun, 6 Dec 2020 14:26:22 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v7 04/17] luks2: Make sure all fields of output argument in luks2_parse_digest() are written to Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="uQr0NoB89sCD/nv3" Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=64.147.123.24; envelope-from=ps@pks.im; helo=wout1-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2020 13:26:31 -0000 --uQr0NoB89sCD/nv3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 04, 2020 at 10:43:33AM -0600, Glenn Washburn wrote: > We should assume that the output argument "out" is uninitialized and could > have random data. So, make sure to initialize the segments and keyslots b= it > fields because potentially not all bits of those fields are written to. > Otherwise, the digest could say it belongs to keyslots and segments that = it > does not. >=20 > Signed-off-by: Glenn Washburn Makes sense. Signed-off-by: Patrick Steinhardt > --- > grub-core/disk/luks2.c | 2 ++ > 1 file changed, 2 insertions(+) >=20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index bdb90e4b6..eadd529e9 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -230,6 +230,7 @@ luks2_parse_digest (grub_luks2_digest_t *out, const g= rub_json_t *digest) > return grub_error (GRUB_ERR_BAD_ARGUMENT, > "Digest references no segments"); > =20 > + out->segments =3D 0; > for (i =3D 0; i < size; i++) > { > if (grub_json_getchild (&o, &segments, i) || > @@ -242,6 +243,7 @@ luks2_parse_digest (grub_luks2_digest_t *out, const g= rub_json_t *digest) > return grub_error (GRUB_ERR_BAD_ARGUMENT, > "Digest references no keyslots"); > =20 > + out->keyslots =3D 0; > for (i =3D 0; i < size; i++) > { > if (grub_json_getchild (&o, &keyslots, i) || > --=20 > 2.27.0 >=20 --uQr0NoB89sCD/nv3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl/M2/0ACgkQVbJhu7ck PpRSKxAAiqdrAAU612gulYaXV+EFAroBq05iAiqvg1ecALqddm7lmIMG9vR/IK04 QIJMvEpHfVxxfMApze8YC4VY7PamqXod/BDZS2hPg8CcqoWyHg/oBYDc5TDevTJ7 P6FM7m46Q1HSYcOS6wb5d6y+CknR7/yHerIDy10xMOEU4Xh9diQMEyWlGJ8fzFMG o/fpbnBdlx2uUHkMdrs7Yr46nl/cuFeqbY5bd9S96qW71dN49ITjLDQweR5R9SNw 0pcxYq++2OYNZsj6HOu7DFTHOYBYe8r2K5z0q+Wwlc2LscJkC4HaZgw8XtTynEZ+ qDJAKU7+DlIDeVI1pLx6BY1E2LvfPuL/8SmAaeFsEj92nrhHb2Dn9tqPKdMJe97K M4335wGEI1Vkp9Wk62GHSsju/FwwOZZDt6YsuqHN4mJNK70W5nbnwd/0sdUpQkvE MkebKaLUX0WycmFOP6i1ESTS+PAbcY1g6QXXHcWbyZdhQtzxAJpYO/iIFalCK8Z5 npySHkQEEd2S8VVnB2++rz03zL1MfpcpHnk5EEj2h1eL9VH21NGqWS7Th4lRpubT VeLXqNvH5+q/RHTuAuf6Vw5lhte5G6vdio/Lb1zwM4ji4ZBg3BoVh72nCaEMJz74 zZerc42fWV0DkcQYCSTeNgO9QByeVjORNPrk6Z96qONeJeeyg7Q= =fODn -----END PGP SIGNATURE----- --uQr0NoB89sCD/nv3--