From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ko059-00048i-Bi for mharc-grub-devel@gnu.org; Sat, 12 Dec 2020 03:16:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko057-00047M-BT for grub-devel@gnu.org; Sat, 12 Dec 2020 03:16:45 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:47707) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ko04r-0005iL-Gd for grub-devel@gnu.org; Sat, 12 Dec 2020 03:16:45 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 0E77F6DA; Sat, 12 Dec 2020 03:16:26 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 12 Dec 2020 03:16:27 -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=pidvkWDUh1vR8FMkphHiTKc5JR9 tUsjTT2OvOKsgsEE=; b=P0RJn9RgxlAxz82wK/wbmRxmVt+8TDPViH52s77M0u2 Mmg2HKBe4lN+mlt6ogJy7rbZ2aAO1mWA4GXEO+pGWNAdhEsa/Wk4v3FmM+8RP06B vJUFPdWQFoU7m+HkA7ayNRWVHLeijWxthCj6LtyWdTq9fO3GZl4iA04CZ7a+yv20 QTtPOPZ+2iGj137VCV4jb6/31kUC8TKcE0h5hoBNPAOm6tfDfUdtEmH/i6zjOnmi 1C9jtE5S1v61bkbst8SbUCLaE6sv5TLHoDgRhgEQlqxe4zqW8DGQe96oRxsWKmK7 zErQSLl9MHNLNVSvBSiTpBMz/Osap+maSiOSsrO/MuQ== 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=pidvkW DUh1vR8FMkphHiTKc5JR9tUsjTT2OvOKsgsEE=; b=C/k0hoofUrfoQ77PdLP2CI DzFPOXRSCfe1aX5MpP5ojNRQbcWmCo7T8pNSzcew6GbVOBhXL11h62huZWRteh3m WlN8EhRmsd6TZ7rdxIrw1GwHMaGrnpBSKR16e/xW7FAbj2+UMA2TnAuRxWDCgfsk 5oPgerGU3/WRB8tnTihjzgOn+3Fb/Vo9CaWhP3Wcy7TaL02KOOKMz+hIW60ykR/s lbjfebSk5UoH28Oab/LADDsF7feAAspV6HppbLNAEClAPk/+j4vAVQJNlh75S9zd B56/Lb/M/7AIUnpXXJbLV7sH6orzNRxQjmech6kZWwQYdS0ursZGV/Rcc1wHrHDg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudekfedguddulecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepheeghfdtfeeuffehkefgffduleffjedthfdvjeektdfhhedvlefgtefgvdettdfh necukfhppeejjedrudeluddruddtrdduleegnecuvehluhhsthgvrhfuihiivgepvdenuc frrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail (x4dbf0ac2.dyn.telefonica.de [77.191.10.194]) by mail.messagingengine.com (Postfix) with ESMTPA id 98BCA1080063; Sat, 12 Dec 2020 03:16:25 -0500 (EST) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id 69cd0a66 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 12 Dec 2020 08:16:24 +0000 (UTC) Date: Sat, 12 Dec 2020 09:16:23 +0100 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v8 15/18] luks2: Error check segment.sector_size Message-ID: References: <09c5b15f3c4b694cd89fcd59d0e909eadc4b3f7f.1607466704.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7SQCaW5fWB30a36t" Content-Disposition: inline In-Reply-To: <09c5b15f3c4b694cd89fcd59d0e909eadc4b3f7f.1607466704.git.development@efficientek.com> Received-SPF: pass client-ip=64.147.123.25; envelope-from=ps@pks.im; helo=wout2-smtp.messagingengine.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, 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: Sat, 12 Dec 2020 08:16:45 -0000 --7SQCaW5fWB30a36t Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 08, 2020 at 04:45:46PM -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 8cb11e899..c737797b9 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -629,6 +629,17 @@ luks2_recover_key (grub_disk_t source, > =20 > grub_dprintf ("luks2", "Trying keyslot \"%"PRIuGRUB_UINT64_T"\"\n"= , keyslot.idx); > =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\n", > + segment.idx, 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 sizeof (unsigned int) * 8 > --=20 > 2.27.0 >=20 --7SQCaW5fWB30a36t Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl/UfFYACgkQVbJhu7ck PpQwJg//cADXwbZSwPg28H7tdN4D5ZFWdzt5GL6LKdKRRAa13vhcEwL3qDA0BlCe bdEkE4eGV5KxuoYAVYbCWzZTyzDGe5zAWGfEopZ2Qfi6ZMgqdhY5m8pES3epbHeP MosVKlmXE0DzRcn8E6G/POQTPR3MiINxN0h0DQG8cFtaOXPBL5cnuyXPg4wZGOPC 5sixOY0dXniZ29hX3CMn3jjOWcCt47XY9+l++sDiSnC65j6zv43E2j0Z6gQOQZU7 Jph8tGXOFsO2oGS7JOSJN3WWT06yUEvn95NzT4J6x6BobWAnOotB0PhlA+IURlVX CT4OEraFiu0ukpGKt4AQnh/ty95FaZUbgpSsJj8i+ghrRtgffLLzAjhljK7Jsy+V gpkULexW7ghI/T36sKC+eWqUL+sb8y/8OdJxLoRru7LhRA28rEzQV96JPmWR2kSX QmP/gvSSoeHcButV7KorPvzfaZARqFdnsBTKRgBw8Z+EsAuqdizimnqAW7R6MV1e sWXWRf9LS2tqw6ZhMZ/zkns4NopkFUuOpta7Tr9H+OYTdmMug/9fjXauQ1GQTjIx tBfk8QQPou+893EI52N4KpabBZJ7MiprzHHyt14nYcRwZB0IHkzwHpldpiuRKC7W IOLpVvkIHbfn5r6zeq8WxxBGMJ3WM4CR6AMWooliVOCrzpSx+dQ= =HB/G -----END PGP SIGNATURE----- --7SQCaW5fWB30a36t--