From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1keFUR-0004et-Ln for mharc-grub-devel@gnu.org; Sun, 15 Nov 2020 05:42:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keFUQ-0004ea-IT for grub-devel@gnu.org; Sun, 15 Nov 2020 05:42:34 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:43505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keFUO-0005kc-LM for grub-devel@gnu.org; Sun, 15 Nov 2020 05:42:34 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 736A75C0109; Sun, 15 Nov 2020 05:42:31 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 15 Nov 2020 05:42:31 -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=ByucZJfvkLWlP98f8Nld8RiqX/X ySjmCTn755hOrP1Y=; b=P4OP18T2t2yVYiswFJsQOtJ6StlKr+kNTVAz9Cp0E6k sSFdKUob+defNJaU+dMRt04fl69yoJBpgP3zBaeZB9SHlhduuJVpBab4+DK1ip6A GhlH0cF8viIBInedhPGsn6IBxgMFCaORs81I4sS+Rm8pMTGZut1FKV1muKciZXjd wtAL750HDDpez60zgPl2Ey+AAxXwjKkJgY5n7wqUXAjk8l7rf8m6tUM29Unm2LND TNkz7VKOFnYsO1Vcs2oloS3i5LYY2xpp+OCZc55wNQq0Rpi7UmI61QPHdj2ow3nU GG7juaL3ynolE705tCE6vqSRGSlPgojkpJ8yLdMinJQ== 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=ByucZJ fvkLWlP98f8Nld8RiqX/XySjmCTn755hOrP1Y=; b=JfOBJFaHNx9JIOWLvp0wfx HB3gd8aPtKV8tEuDfmpAZ0NJDsOLJPbAi0bCb5rp26bIQ5uH8BekRemRRWeCsjz2 zZsjrOY6WadLYUfkx2aeJb/uCrtSVZuUIgSY7vsXLrDQNd9r6230knnCka242ExY cuZrf9xFSs+vl1UiwuUTMVk1KB3sEJ1LZpQbamnyPDmVTC/Eow2tsK1qpI+dhvwb uNg4LRnXF3llY+fbW8/XXGLqNp/y+z8R7t+CBiUZwso9V1LZ+DYAFyChWb6BimN2 932ds/wD9DuWVS70sXUGe6pnJrgPh8NulHwkN62emT7SlJ1QrXize1KeWo6sabRg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvledgvddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeekrdehgedrvddurddvtdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-078-054-021-206.78.54.pool.telefonica.de [78.54.21.206]) by mail.messagingengine.com (Postfix) with ESMTPA id 549A53064AA7; Sun, 15 Nov 2020 05:42:30 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 645fa45f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 15 Nov 2020 10:42:26 +0000 (UTC) Date: Sun, 15 Nov 2020 11:42:24 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v4 15/15] luks2: Error check segment.sector_size. Message-ID: References: <6ef5c99654c98c6f127b3af3e74d807c49b2e4d6.1604723348.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="4qOC+EsM4QvloZ5M" Content-Disposition: inline In-Reply-To: <6ef5c99654c98c6f127b3af3e74d807c49b2e4d6.1604723348.git.development@efficientek.com> Received-SPF: pass client-ip=66.111.4.27; envelope-from=ps@pks.im; helo=out3-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/15 04:37:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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, 15 Nov 2020 10:42:34 -0000 --4qOC+EsM4QvloZ5M Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Nov 06, 2020 at 10:44:35PM -0600, Glenn Washburn wrote: > Signed-off-by: Glenn Washburn Reviewed-by: Patrick Steinhardt > --- > grub-core/disk/luks2.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) >=20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index 751b48d6a..b628043e0 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -622,6 +622,17 @@ luks2_recover_key (grub_disk_t source, > =20 > grub_dprintf ("luks2", "Trying keyslot %"PRIuGRUB_UINT64_T"\n", ke= yslot.slot_key); > =20 > + /* Sector size should be one of 512, 1024, 2048, or 4096. */ > + if (!(segment.sector_size =3D=3D 512 || segment.sector_size =3D=3D= 1024 || > + segment.sector_size =3D=3D 2048 || segment.sector_size =3D= =3D 4096)) > + { > + grub_dprintf ("luks2", "Segment \"%"PRIuGRUB_UINT64_T"\" sector" > + " size %"PRIuGRUB_UINT64_T" is not one of" > + " 512, 1024, 2048, or 4096.", > + segment.slot_key, segment.sector_size); > + continue; > + } > + > /* Set up disk according to keyslot's segment. */ > crypt->offset_sectors =3D grub_divmod64 (segment.offset, segment.s= ector_size, NULL); > crypt->log_sector_size =3D grub_log2ull (segment.sector_size); > --=20 > 2.27.0 >=20 --4qOC+EsM4QvloZ5M Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl+xBg8ACgkQVbJhu7ck PpRPiQ//bxD8oiDi8iOxW8fELhxzDRFpTzrP9p5u1ihTQjGGM8glCV3OtTBmuklX zIIhtqRfJreMAkJeoWyGesVF0qwBg3L5kP8WmXk2nXDKmqRJEp64akwnUR8XSaOf LY21SD1AFo3CYUsH1j93kYzelrRH+OwabRFQnZcKg/AWZQ2V9DamKu37O7+ah+C1 xBnERqOeRfWVc/wzgenzQNlcWecowQsCzJa3hZaAivbEBfM2vpmxaH5rhnGMWy6T pCGTNdNsNdtAx0sI1+j8F12ORA9IovxiTcLJCQ2xfH2VE72Fx15GpGIcBVbGgm5l PGlcNJeZE/Yp64Rl+7Sg7cX5EwYggXTKRDDjFjIQscjPmEF9akTsALlO4eD4gVVR SRRbrafwg1Wg3T+R41DpfpO6IcFaWeYiHQx7dNb8PGqDtZ35me30j0Chh1a73cA6 c11/3VWic3opHU8BFG3aye4WXdjQcGlPdsYP1YLMQbXUlI0ScVK9VcO2bCxPbdSS KvEWUlAYqrhZQNEfDdbU6BpBLri8Y/gfKD79PD5A6zqAy9/+haKIUOOwRFdsUQhG aGZWA/F/i7W+bHfX6gTUfCcQHTQJsNHUFXwzu/mHfSi7bsbgozjzKEQLF9DWb3cr WIIs2scPtYnuNlCNN0YTvuWSPJBqu5Eocl3lIMQaoAPvRnCVXPA= =DpIh -----END PGP SIGNATURE----- --4qOC+EsM4QvloZ5M--