Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jiMpW-0001TY-EX for mharc-grub-devel@gnu.org; Mon, 08 Jun 2020 14:49:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiMpU-0001SC-M3 for grub-devel@gnu.org; Mon, 08 Jun 2020 14:49:04 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:55079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiMpS-0003WW-L6 for grub-devel@gnu.org; Mon, 08 Jun 2020 14:49:04 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 439595C0079; Mon, 8 Jun 2020 14:48:59 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 08 Jun 2020 14:48:59 -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=fm1; bh=7qa1ykigIMnNRMjImLBGWat4RTR +ylFvXcJOeNzFWk4=; b=WMBINoHFckSO2/z2fbjZA6KWWzOrlbFb/3li8Vx0IJE isNcZL4db5uCzHZWR8vO8h8by9DQzftzBBqqwjUQmtRykbr1VFrWiNc1wzh8CSgJ sXEHG4SiDKvPUf86fCFSkp2ATWw04bYCIlpNFMhkFJKjuB2HRgGYQDPVXXCLTRPI l8w7Jo6fmMNpwtLTP3/ihluJ/ixHjnW5PGw2uJSF6d4Q4ombqmABkqw/9jninN0n QLDaxjchzas+mLD7vQf32Zez3k8nLi74kIUWrxYqO5y/27tekiWyu6BwbIsdSGxU 7Bm3nLp2TdDYa9GsJ/23MIsmfrvYr43KWLmBqDOi+uQ== 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=fm3; bh=7qa1yk igIMnNRMjImLBGWat4RTR+ylFvXcJOeNzFWk4=; b=N8XNbitTcxIE3oMYTngsNe NVrOx6Jgwa0rhcpAvV7IT6ZSUMq2hWuzxBnzitNKehug7nR3PxGJ8h6oE+1Dvm/I D/PGIkrts8aBLhR968PU2mv3Qgu1R80Xs68ZHPnUfmyj28BizcgTkkhrQw6DTg+/ vcMpKYET6jfrnrsH5OXgMJQdd9FepkczkbNxNc1jnffrtQTAUBI1AWVc9TjffvTQ k9nwsm+L47cOoP2ZeynNx1bvHsa0Vl0PEbaRfax24oJWdKZwd57vmMYMmN+o/UkQ cliyDyrpoLuK6brcn666uzae7i/+DV2g8VoncJRe403VzovJcfcdFW0lYRp9Ed/A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudehvddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeekrdehhedruddvtddrudeigeenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Received: from vm-mail.pks.im (x4e3778a4.dyn.telefonica.de [78.55.120.164]) by mail.messagingengine.com (Postfix) with ESMTPA id 1106E328005A; Mon, 8 Jun 2020 14:48:57 -0400 (EDT) Received: from localhost (xps [10.192.0.12]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 699569c2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 8 Jun 2020 18:48:52 +0000 (UTC) Date: Mon, 8 Jun 2020 20:50:15 +0200 From: Patrick Steinhardt To: Denis 'GNUtoo' Carikli Cc: Daniel Kiper , The development of GNU GRUB , John Lane Subject: Re: [PATCH v4][ 5/6] cryptodisk: enable the backends to implement key files Message-ID: <20200608184959.GA896@xps.pks.im> References: <20200604034324.4565-1-GNUtoo@cyberdimension.org> <20200604034324.4565-6-GNUtoo@cyberdimension.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="lEGEL1/lMxI0MVQ2" Content-Disposition: inline In-Reply-To: <20200604034324.4565-6-GNUtoo@cyberdimension.org> Received-SPF: pass client-ip=66.111.4.28; envelope-from=ps@pks.im; helo=out4-smtp.messagingengine.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/08 14:48:59 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Mon, 08 Jun 2020 18:49:05 -0000 --lEGEL1/lMxI0MVQ2 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 04, 2020 at 05:43:23AM +0200, Denis 'GNUtoo' Carikli wrote: > @@ -1112,6 +1117,88 @@ 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 */ > + { > + const char *p =3D NULL; > + 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, &p, 0); > + > + if (grub_errno !=3D GRUB_ERR_NONE) > + return grub_errno; > + > + if (*p !=3D '\0') > + return grub_error (GRUB_ERR_BAD_ARGUMENT, > + N_("unrecognized number")); > + } > + else > + { > + keyfile_offset =3D 0; > + } > + > + if (state[6].set) /* keyfile-size */ > + { > + requested_keyfile_size =3D grub_strtoul(state[6].arg, &p, 0); Nit: missing space after `grub_strtoul`. > + if (*p !=3D '\0') > + return grub_error (GRUB_ERR_BAD_ARGUMENT, > + N_("unrecognized number")); > + > + 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 (%" \ > + PRIuGRUB_SIZE ")\n"), > + GRUB_CRYPTODISK_MAX_KEYFILE_SIZE); Here too, ... > + if (requested_keyfile_size =3D=3D 0) > + return grub_error(GRUB_ERR_OUT_OF_RANGE, > + N_("Key file size is 0\n")); > + } and here. There's also two newlines instead of one, which also applies... > + 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; > + > + here. > + if (requested_keyfile_size) > + { > + if (requested_keyfile_size > (keyfile->size - keyfile_offset)) > + return grub_error (GRUB_ERR_FILE_READ_ERROR, > + N_("Keyfile is too small: " \ > + "requested %" PRIuGRUB_SIZE " bytes, " \ > + "but the file only has %" PRIuGRUB_SIZE \ > + " bytes.\n"), These trailing backslashes aren't required. C handles strings split over multiple lines without any need for escaping. Patrick --lEGEL1/lMxI0MVQ2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAl7eiGYACgkQVbJhu7ck PpTVLg//edj1w3J0xKoNkfgC3Z39uGFWYBt/ZdERSipgEk+TxyA98uk7KheWnMGS WNXkih66ONTlTxMdhxgzkNAjRMMpdLFIA1s7Wq+5u9IUzOks1vQNHGLAXis4Jkg+ ztzMj+f1bMp6HfephlOrk0Yolyyzuyz8rwYS3LUBx0d6khA1tjJSH53n46ZJoGnE UGADZfJXi4AhxrBYvlj07qlirHXzBWsVw285jjzY3MttHeOzJjlqrT0eCKS79zOX y5yYiAJ69D15QnRR7MG2G1zHNIIU8f4VTy/dgqbsHg60RoxIyAMLVi3xBNUNpvmF ZevjX4+mnD3hW3tjeAO0HO8QywP6oX/+xQvkORPj9DzNwfNZeF6Khh3jFjsY7wnq EAuZgttYXEIVbCyVQxDWH5z6htJezi2OZC6yww+HyQJCf/CtzAsmX8Kiced/5U7r Q4CjNL4VYvvhB9ezPZV7fGOVXaBkexxURrKhawMR6zqiK+3DPP6CeDaQNPr0TCnK lJP99AtA8MiOu0luNadA6QG+suGGn/cwgfi6OQcpSuez/dRsOLqU/T93k3zARgRp t1wsrpzj4K+P3wa3oqDMhGIlrixS5hHZwDcJwc+QDXksQnAlSmCcCeu2WdpYvWGd KAdB2ni+olGxHRk7+AnsCuGirjC0dccOvFj/agdkhFFR8K08w0w= =HpDQ -----END PGP SIGNATURE----- --lEGEL1/lMxI0MVQ2--