Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jKgn5-0008Bj-Mj for mharc-grub-devel@gnu.org; Sat, 04 Apr 2020 07:16:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44729) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKgmz-0008Aq-BO for grub-devel@gnu.org; Sat, 04 Apr 2020 07:16:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKgmx-000530-Tm for grub-devel@gnu.org; Sat, 04 Apr 2020 07:16:37 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52535) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jKgmx-00052X-IG for grub-devel@gnu.org; Sat, 04 Apr 2020 07:16:35 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 61ACE5C022B; Sat, 4 Apr 2020 07:16:34 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Sat, 04 Apr 2020 07:16:34 -0400 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=fm3; bh=t9C11Zh/XJZ8/A9VCZEhxGPecMc cCyE6+7v66gVmbPY=; b=N1bdX5SErXRkRPSpTOmndel5qfoxwB65mzvzGoyu33D X4z8Hc2A+EU3LN0vd6lI9vgX8u6q5kOw1IU39vgS9LoHJZcWlUL0VddruJyj3nb8 0pdUfa97PWP2C4zC1SFecqAS+yRbdRFiI72E2RjcnCDgL+Pwe9nLY0dJQuBh4KBd YxXsvNA6FuV5hQsg23RjWqkicLAinRo2cMvTYekct5A/97tqWTGcyYO1nCnApH3J 8fmJDa/C3TFx3Z3rE/fq8jcgekW49RKwwBjja4X06ZWSt4WWd+Yzih9zHawpvrXr ERbktxOr5X9AOCuLMGAqVq2iAXS8HCEfGH4zdaY/BsA== 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=fm2; bh=t9C11Z h/XJZ8/A9VCZEhxGPecMccCyE6+7v66gVmbPY=; b=mowYYsa96Pv1/QvPeJP0VL 6BlJ8RZ/ihktwkCMg0x0Sk7lUS4N2EvO6j7OS/LdAuIZ0+xJm04TPpI5onh41wsv zuvviLHAyQJ6WMBLFA5QFA1lHsOGlR4/zZJ8EeCypje9PafCregTiFFART6nUPkk Sm5+usfwf1OSwZgcEqniq0NrCNhdY01Gz1X8kI8Ce1k7M2tyJ5UhhqwedgLQ836q oRUDFaLSQr7ZVM6DnOzvXs/QTwWbHkNskevGRcbuvXUQzvYzvhUuH2bHfrtVR9rj uIX6ufh4l5shuxd6VLXnXb2XKQ93oz2HibaKm3ZB27y+PhRHY+eLVBGtcB3/ixDA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrtdekgdefjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhrihgt khcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecukfhppeejjedruddurd dugedvrddujeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhf rhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (x4d0b8eb1.dyn.telefonica.de [77.11.142.177]) by mail.messagingengine.com (Postfix) with ESMTPA id 8AE91328005A; Sat, 4 Apr 2020 07:16:32 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 6877ee6c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 4 Apr 2020 11:16:31 +0000 (UTC) Date: Sat, 4 Apr 2020 13:16:32 +0200 From: Patrick Steinhardt To: Denis 'GNUtoo' Carikli Cc: Daniel Kiper , The development of GNU GRUB , John Lane Subject: Re: [PATCHv2][ 5/6] cryptodisk: enable the backends to implement key files Message-ID: <20200404111632.GB34655@ncase.pks.im> References: <20200317075740.5430-1-GNUtoo@cyberdimension.org> <20200317075740.5430-5-GNUtoo@cyberdimension.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="DKU6Jbt7q3WqK7+M" Content-Disposition: inline In-Reply-To: <20200317075740.5430-5-GNUtoo@cyberdimension.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.25 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, 04 Apr 2020 11:16:39 -0000 --DKU6Jbt7q3WqK7+M Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 17, 2020 at 08:57:39AM +0100, Denis 'GNUtoo' Carikli wrote: > From: John Lane >=20 > Signed-off-by: John Lane > GNUtoo@cyberdimension.org: rebase, patch split, small fixes, commit messa= ge > Signed-off-by: Denis 'GNUtoo' Carikli > --- > grub-core/disk/cryptodisk.c | 71 ++++++++++++++++++++++++++++++++++++- > grub-core/disk/geli.c | 4 ++- > grub-core/disk/luks.c | 4 ++- > grub-core/disk/luks2.c | 4 ++- > include/grub/cryptodisk.h | 5 ++- > include/grub/file.h | 2 ++ > 6 files changed, 85 insertions(+), 5 deletions(-) >=20 > diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c > index fa342fe44..2adb224d0 100644 > --- a/grub-core/disk/cryptodisk.c > +++ b/grub-core/disk/cryptodisk.c > @@ -42,6 +42,9 @@ static const struct grub_arg_option options[] =3D > {"all", 'a', 0, N_("Mount all."), 0, 0}, > {"boot", 'b', 0, N_("Mount all volumes with `boot' flag set."), 0, 0= }, > {"header", 'H', 0, N_("Read header from file"), 0, ARG_TYPE_STRING}, > + {"keyfile", 'k', 0, N_("Key file"), 0, ARG_TYPE_STRING}, > + {"keyfile-offset", 'O', 0, N_("Key file offset (bytes)"), 0, ARG_TYP= E_INT}, > + {"keyfile-size", 'S', 0, N_("Key file data size (bytes)"), 0, ARG_TY= PE_INT}, > {0, 0, 0, 0, 0, 0} > }; > =20 > @@ -972,6 +975,8 @@ grub_util_cryptodisk_get_uuid (grub_disk_t disk) > static int check_boot, have_it; > static char *search_uuid; > static grub_file_t hdr; > +static grub_uint8_t *key, keyfile_buffer[GRUB_CRYPTODISK_MAX_KEYFILE_SIZ= E]; > +static grub_ssize_t key_size; > =20 > static void > cryptodisk_close (grub_cryptodisk_t dev) > @@ -1002,7 +1007,7 @@ grub_cryptodisk_scan_device_real (const char *name,= grub_disk_t source) > if (!dev) > continue; > =20 > - err =3D cr->recover_key (source, dev, hdr); > + err =3D cr->recover_key (source, dev, hdr, key, key_size); > if (err) > { > cryptodisk_close (dev); > @@ -1112,6 +1117,70 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, = int argc, char **args) > hdr =3D NULL; > =20 > have_it =3D 0; > + key =3D NULL; > + > + if (state[4].set) /* keyfile */ > + { > + grub_file_t keyfile; > + int keyfile_offset; > + grub_size_t requested_keyfile_size =3D 0; > + > + if (state[5].set) /* keyfile-offset */ > + { > + keyfile_offset =3D grub_strtoul (state[5].arg, 0, 0); We should pass in an `endptr` argument here to check that the argument didn't have any trailing gargabe. Otherwise we might accept parameters like "1234foobar". > + > + if (grub_errno !=3D GRUB_ERR_NONE) > + return grub_errno; > + } > + else > + { > + keyfile_offset =3D 0; > + } > + > + if (state[6].set) /* keyfile-size */ > + { > + requested_keyfile_size =3D grub_strtoul(state[6].arg, 0, 0); The same applies here. > + if (grub_errno !=3D GRUB_ERR_NONE) > + return grub_errno; > + > + if (requested_keyfile_size > GRUB_CRYPTODISK_MAX_KEYFILE_SIZE) > + return grub_error(GRUB_ERR_OUT_OF_RANGE, > + N_("Key file size exceeds maximum (%llu)\n"), \ > + (unsigned long long) GRUB_CRYPTODISK_MAX_KEYFILE_SIZE); > + } Should we return an error in case `requested_keyfile_size =3D=3D 0`? > + keyfile =3D grub_file_open (state[4].arg, > + GRUB_FILE_TYPE_CRYPTODISK_ENCRYPTION_KEY); > + if (!keyfile) > + return grub_errno; > + > + if (grub_file_seek (keyfile, keyfile_offset) =3D=3D (grub_off_t)-1) > + return grub_errno; > + > + > + if (state[6].set) /* keyfile-size */ > + { > + if (requested_keyfile_size > (keyfile->size - keyfile_offset)) > + return grub_error (GRUB_ERR_FILE_READ_ERROR, > + N_("Cannot read %llu bytes for key file (read %llu bytes)\n"), > + (unsigned long long) requested_keyfile_size, > + (unsigned long long) keyfile->size); > + > + key_size =3D requested_keyfile_size; > + } Instead of checking `state[6].set` we could use `requested_keyfile_size` here, which might be a bit easier to read. I also think the error message could be improved a bit as we didn't yet try to read, but it sounds like we did. How about "Keyfile is too small (requested %llu bytes, but the file only has %llu bytes)". > + else > + { > + key_size =3D keyfile->size - keyfile_offset; > + } > + > + if (grub_file_read (keyfile, keyfile_buffer, key_size) !=3D key_si= ze) > + return grub_error (GRUB_ERR_FILE_READ_ERROR, > + (N_("Error reading key file\n"))); > + key =3D keyfile_buffer; > + } > + > if (state[0].set) > { > grub_cryptodisk_t dev; > diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c > index bec0bb877..7b3f3e721 100644 > --- a/grub-core/disk/geli.c > +++ b/grub-core/disk/geli.c > @@ -401,7 +401,9 @@ geli_scan (grub_disk_t disk, const char *check_uuid, = int boot_only, > =20 > static grub_err_t > recover_key (grub_disk_t source, grub_cryptodisk_t dev, > - grub_file_t hdr __attribute__ ((unused))) > + grub_file_t hdr __attribute__ ((unused)), > + grub_uint8_t *key __attribute__ ((unused)), > + grub_size_t keyfile_size __attribute__ ((unused))) > { The same thought applies here as for the `hdr` attribute: in case a key or keyfile size was passed but the backend doesn't support it, I think we should return an error. Patrick --DKU6Jbt7q3WqK7+M Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl6IbI8ACgkQVbJhu7ck PpSnXhAAlgE0olaDLx0v/1o5GDry1ptCvBZrztZB7Qws6jpDhiKtGZqOlr7PNQSv 5rSOUvvzrLB9O3MsQtS5319yEuGm9VYyEFH9HC74PSji4id/KT+Vvq5FqIiwJ5Ur lfoXkVAK7BTiccH/59TIK4xmjcvJbX9ruP9u0cNhKARF0yqBrZUd4z3jWFtu5hGq 02R8k3EDy+bL7gKac/z6TeyuMaciBe//GEQPOY1uNkMfIb5IBHkQKaaiP5uQaLoG W4KTwr42x+bdY8OHlFshVk2jztD/X4f021R/HqIpc232qiFPngEJ++1AsXOZRw2Y Rtx3OsWg8LZITIzTz4+Agv0RSDOqgA3BGcu/2sG8Xx0/NCKt9amqkTFt6fU6n1hh GVpbaL7/83IRrmEy9q4k7RiVdf2owmQ6H4p6xmNZF5pC6CKBihmcaN//7xO1gocM 8PYArk4JzO0uUG9HZhwK9BCndT1Hw9JZo0q9CziECS0FilHMsYhd+AE3uNy3dbm5 2o2KUxBivlhj+JXlOC+XITB+psRPCQY65AotEIo8lN2LVokKwHUDc/Ie2GKEcxDQ karRQS+cFgKkLNmmJDDnE1LH6J5e8gZXx/RQE6lRjaHg4bvFTbBlXHE/UD7XlN+M 8WszXbu7qr4vxjlCYT5dsfIJZndm702uQ4hTJF+U65/t1HUx80g= =Q5am -----END PGP SIGNATURE----- --DKU6Jbt7q3WqK7+M--