Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1oNc0w-0007E6-A7 for mharc-grub-devel@gnu.org; Mon, 15 Aug 2022 11:28:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNc0v-0007D5-C0 for grub-devel@gnu.org; Mon, 15 Aug 2022 11:28:25 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:59541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNc0t-00066a-7b for grub-devel@gnu.org; Mon, 15 Aug 2022 11:28:25 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id A3929320094F; Mon, 15 Aug 2022 11:28:21 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 15 Aug 2022 11:28:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1660577301; x=1660663701; bh=Q6HC9nS7mQ K7mHCyQG8nwy+vYoAXgq8hwl9iBj/4o/c=; b=PhcRDQZvIhpAGM6rVot0O6QPik k5UcPXJs+QIEXzIHr2Y5d3RbPvqc5oFMuo9HErEQEtUugXYpPM3bNEHfHMeJDN3s a/w7Fht/UzxRkzZbQEmHf52oi7RxrIxLUuIYfTyOhuASOJzlsYuKCNtluo3UWNtO 6UkcFdsU0gsTP6AnJwwQAAM4k+YAiZ/R9oJLehqxnt8Wa/92dtu0yc2fZq9GtarM 0XGZMR4F2UCoNcGe6l0USRvC3vabIiuUotSNm8/RfeN3sAONmQW4CbXB5aPLig8K Titpm1VTbiN6dXOUHYm/ywoauzerx5VYvC7KBLBvpa7phcaqXn6dgu9L+Fuw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1660577301; x=1660663701; bh=Q6HC9nS7mQK7mHCyQG8nwy+vYoAX gq8hwl9iBj/4o/c=; b=36Zl8vq5h+eH/gcypPzay+urCvoZ7kK5/RZAQSvE/X/D DTYWSMRKHkvd384vIYwIgNG4MVx87X9lQwAqv7LQ5N7a37gR0F5eG9vYP+5W7U+B IU4rBa5nnlggr9JM54mWgPDslZ/ubPzFK47FBUYyu+Qf+qEs58FirpOZOHvGiU/x CW4Bbv6V4PJO5qn632fKXOM4J26QrYQzUUAk0R23FaISaTHqxltyXQIurxwsOoTt yRypM5mOj9FAWmkF8tUE8Jr9ZE/E3HQKxSARvojZWXAD9WEkwqjadDCW8kVYsW5w 5eLRb1rvN79DGxnL9kAv1ta1Uz9dmYjAvLcW3inh+g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehvddgledtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepueektdevtdffveeljeetgfehheeigeekleduvdeffeeghefgledttdehjeelffet necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhsse hpkhhsrdhimh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 11:28:20 -0400 (EDT) Received: from localhost (xps [10.192.0.12]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 841d9f4f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 15 Aug 2022 15:28:16 +0000 (UTC) Date: Mon, 15 Aug 2022 17:28:24 +0200 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper Subject: Re: [PATCH v5 2/2] cryptodisk: Allows UUIDs to be compared in a dash-insensitive manner Message-ID: References: <7d6d9dbebd6aaa0156c2655630634541b54f8215.1659560233.git.development@efficientek.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="HafRawf+NxxCITJn" Content-Disposition: inline In-Reply-To: <7d6d9dbebd6aaa0156c2655630634541b54f8215.1659560233.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: -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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2022 15:28:25 -0000 --HafRawf+NxxCITJn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Aug 11, 2022 at 12:48:43PM -0500, Glenn Washburn wrote: > A user can now specify UUID strings with dashes, instead of having to rem= ove > dashes. This is backwards-compatability preserving and also fixes a source > of user confusion over the inconsistency with how UUIDs are specified > between file system UUIDs and cryptomount UUIDs. Since cryptsetup, the > reference implementation for LUKS, displays and generates UUIDs with dash= es > there has been additional confusion when using the UUID strings from > cryptsetup as exact input into GRUB does not find the expected cryptodisk. >=20 > A new function grub_uuidcasecmp is added that is general enough to be used > other places where UUIDs are being compared. >=20 > Signed-off-by: Glenn Washburn > --- > grub-core/disk/cryptodisk.c | 4 ++-- > grub-core/disk/geli.c | 2 +- > grub-core/disk/luks.c | 21 ++++----------------- > grub-core/disk/luks2.c | 15 ++++----------- > include/grub/misc.h | 28 ++++++++++++++++++++++++++++ > 5 files changed, 39 insertions(+), 31 deletions(-) >=20 > diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c > index f1fe0d390..00d66ab02 100644 > --- a/grub-core/disk/cryptodisk.c > +++ b/grub-core/disk/cryptodisk.c > @@ -701,7 +701,7 @@ grub_cryptodisk_open (const char *name, grub_disk_t d= isk) > if (grub_memcmp (name, "cryptouuid/", sizeof ("cryptouuid/") - 1) =3D= =3D 0) > { > for (dev =3D cryptodisk_list; dev !=3D NULL; dev =3D dev->next) > - if (grub_strcasecmp (name + sizeof ("cryptouuid/") - 1, dev->uuid) =3D= =3D 0) > + if (grub_uuidcasecmp (name + sizeof ("cryptouuid/") - 1, dev->uuid, siz= eof (dev->uuid)) =3D=3D 0) > break; > } > else > @@ -928,7 +928,7 @@ grub_cryptodisk_get_by_uuid (const char *uuid) > { > grub_cryptodisk_t dev; > for (dev =3D cryptodisk_list; dev !=3D NULL; dev =3D dev->next) > - if (grub_strcasecmp (dev->uuid, uuid) =3D=3D 0) > + if (grub_uuidcasecmp (dev->uuid, uuid, sizeof (dev->uuid)) =3D=3D 0) > return dev; > return NULL; > } > diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c > index e190066f9..722910d64 100644 > --- a/grub-core/disk/geli.c > +++ b/grub-core/disk/geli.c > @@ -305,7 +305,7 @@ geli_scan (grub_disk_t disk, grub_cryptomount_args_t = cargs) > return NULL; > } > =20 > - if (cargs->search_uuid !=3D NULL && grub_strcasecmp (cargs->search_uui= d, uuid) !=3D 0) > + if (cargs->search_uuid !=3D NULL && grub_uuidcasecmp (cargs->search_uu= id, uuid, sizeof (uuid)) !=3D 0) > { > grub_dprintf ("geli", "%s !=3D %s\n", uuid, cargs->search_uuid); > return NULL; > diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c > index 7f837d52c..9e1e6a5d9 100644 > --- a/grub-core/disk/luks.c > +++ b/grub-core/disk/luks.c > @@ -66,10 +66,7 @@ static grub_cryptodisk_t > luks_scan (grub_disk_t disk, grub_cryptomount_args_t cargs) > { > grub_cryptodisk_t newdev; > - const char *iptr; > struct grub_luks_phdr header; > - char *optr; > - char uuid[sizeof (header.uuid) + 1]; > char ciphername[sizeof (header.cipherName) + 1]; > char ciphermode[sizeof (header.cipherMode) + 1]; > char hashspec[sizeof (header.hashSpec) + 1]; > @@ -92,19 +89,9 @@ luks_scan (grub_disk_t disk, grub_cryptomount_args_t c= args) > || grub_be_to_cpu16 (header.version) !=3D 1) > return NULL; > =20 > - grub_memset (uuid, 0, sizeof (uuid)); > - optr =3D uuid; > - for (iptr =3D header.uuid; iptr < &header.uuid[ARRAY_SIZE (header.uuid= )]; > - iptr++) > + if (cargs->search_uuid !=3D NULL && grub_uuidcasecmp (cargs->search_uu= id, header.uuid, sizeof (header.uuid)) !=3D 0) > { > - if (*iptr !=3D '-') > - *optr++ =3D *iptr; > - } > - *optr =3D 0; > - > - if (cargs->search_uuid !=3D NULL && grub_strcasecmp (cargs->search_uui= d, uuid) !=3D 0) > - { > - grub_dprintf ("luks", "%s !=3D %s\n", uuid, cargs->search_uuid); > + grub_dprintf ("luks", "%s !=3D %s\n", header.uuid, cargs->search_u= uid); > return NULL; > } > =20 > @@ -123,7 +110,7 @@ luks_scan (grub_disk_t disk, grub_cryptomount_args_t = cargs) > newdev->source_disk =3D NULL; > newdev->log_sector_size =3D GRUB_LUKS1_LOG_SECTOR_SIZE; > newdev->total_sectors =3D grub_disk_native_sectors (disk) - newdev->of= fset_sectors; > - grub_memcpy (newdev->uuid, uuid, sizeof (uuid)); > + grub_memcpy (newdev->uuid, header.uuid, sizeof (header.uuid)); > newdev->modname =3D "luks"; > =20 > /* Configure the hash used for the AF splitter and HMAC. */ > @@ -143,7 +130,7 @@ luks_scan (grub_disk_t disk, grub_cryptomount_args_t = cargs) > return NULL; > } > =20 > - COMPILE_TIME_ASSERT (sizeof (newdev->uuid) >=3D sizeof (uuid)); > + COMPILE_TIME_ASSERT (sizeof (newdev->uuid) >=3D sizeof (header.uuid)); > return newdev; > } > =20 > diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c > index bf741d70f..ac3ab095c 100644 > --- a/grub-core/disk/luks2.c > +++ b/grub-core/disk/luks2.c > @@ -350,8 +350,6 @@ luks2_scan (grub_disk_t disk, grub_cryptomount_args_t= cargs) > { > grub_cryptodisk_t cryptodisk; > grub_luks2_header_t header; > - char uuid[sizeof (header.uuid) + 1]; > - grub_size_t i, j; > =20 > if (cargs->check_boot) > return NULL; > @@ -362,14 +360,9 @@ luks2_scan (grub_disk_t disk, grub_cryptomount_args_= t cargs) > return NULL; > } > =20 > - for (i =3D 0, j =3D 0; i < sizeof (header.uuid); i++) > - if (header.uuid[i] !=3D '-') > - uuid[j++] =3D header.uuid[i]; > - uuid[j] =3D '\0'; > - > - if (cargs->search_uuid !=3D NULL && grub_strcasecmp (cargs->search_uui= d, uuid) !=3D 0) > + if (cargs->search_uuid !=3D NULL && grub_uuidcasecmp (cargs->search_uu= id, header.uuid, sizeof (header.uuid)) !=3D 0) > { > - grub_dprintf ("luks2", "%s !=3D %s\n", uuid, cargs->search_uuid); > + grub_dprintf ("luks2", "%s !=3D %s\n", header.uuid, cargs->search_= uuid); > return NULL; > } > =20 > @@ -377,8 +370,8 @@ luks2_scan (grub_disk_t disk, grub_cryptomount_args_t= cargs) > if (!cryptodisk) > return NULL; > =20 > - COMPILE_TIME_ASSERT (sizeof (cryptodisk->uuid) >=3D sizeof (uuid)); > - grub_memcpy (cryptodisk->uuid, uuid, sizeof (uuid)); > + COMPILE_TIME_ASSERT (sizeof (cryptodisk->uuid) >=3D sizeof (header.uui= d)); > + grub_memcpy (cryptodisk->uuid, header.uuid, sizeof (header.uuid)); > =20 > cryptodisk->modname =3D "luks2"; > return cryptodisk; > diff --git a/include/grub/misc.h b/include/grub/misc.h > index 1c25c1767..2ed378188 100644 > --- a/include/grub/misc.h > +++ b/include/grub/misc.h > @@ -244,6 +244,34 @@ grub_strncasecmp (const char *s1, const char *s2, gr= ub_size_t n) > - (int) grub_tolower ((grub_uint8_t) *s2); > } > =20 > +/* Do a case insensitive compare of two UUID strings by ignoring all das= hes */ > +static inline int > +grub_uuidcasecmp (const char *uuid1, const char *uuid2, grub_size_t n) Nit: I find it a bit unclear with how `n` is supposed to be used. You might expect it to denote the maximum length of either of the UUIDs, but it's not really given that you skip over dashes without decrementing it. So this rather looks like the "length of non-dash characters in either of the UUIDs", which is likely not all that useful to the caller. We should either clearly document the intent of this parameter, or make it more useful by e.g. allowing the caller to pass both a `uuid1len` and `uuid2len`, which get properly decremented when skipping over dashes. Patrick > +{ > + if (n =3D=3D 0) > + return 0; > + > + while (*uuid1 && *uuid2 && --n) > + { > + /* Skip forward to non-dash on both UUIDs. */ > + while ('-' =3D=3D *uuid1) > + ++uuid1; > + > + while ('-' =3D=3D *uuid2) > + ++uuid2; > + > + if (grub_tolower ((grub_uint8_t) *uuid1) > + !=3D grub_tolower ((grub_uint8_t) *uuid2)) > + break; > + > + uuid1++; > + uuid2++; > + } > + > + return (int) grub_tolower ((grub_uint8_t) *uuid1) > + - (int) grub_tolower ((grub_uint8_t) *uuid2); > +} > + > /* > * Note that these differ from the C standard's definitions of strtol, > * strtoul(), and strtoull() by the addition of two const qualifiers on = the end > --=20 > 2.34.1 >=20 --HafRawf+NxxCITJn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAmL6ZhcACgkQVbJhu7ck PpSjiw/9GR2sHg7F9lIZciCeUbIII8iqD/O41f0dqgvTbGnP0STcZbkWyF1+sPXX /Nv6DWhOXhEgsfEjUNqZL3NfDVkBxHKTffAXrnz/W9umMrzRjdXVIkTu/nYUqAZJ JrTtfy4Y+1UsNmjmyDUJ8Z2qUTCzX3WrmFRKSdBNXZ2N5VY+WiHFJ9ZnadhuODF4 YJzK+kvcbmQDm5nPg5LhxaDtx4PsuhmuD37BK2ji64+dTdMKcoAYZYod2xctU7ql AL8lpskMUv3fE5xOqGjaPwxrYA71vxNx4J6PoSMvutIVJRFvXi1ndbhGtv47N5us z1WBWrgA7WeJJAHfE5AbsObw9JZMCIjB0p90E300XmiUAhHlElmdVbNqa55qLwSO zpvDnz3HUiCmaRkDH2Ok6qwBZsbFcDhwvfaiPaCIcDtsF7l8uvf1pHR5E9I8R5Y8 tap7a7ytl/n/f3x3CG8nfC+sdJJMf8uDTWXA54SQPT9AU7Yn1bfVRpulS8pF/jst 5qbFZ7/PDsHi4fCnIauvGU8xiTViWKQce/uX18vLrwdtsltXT4qIbkKwONt5Lyb3 Fq2NH45ywODF9SiI43cizh06/L8Lx59s6cY7Uvh/jIRCQorvOd3UxLQG+dxebLwh T4nn2IGQlEzrpnUYnLIfS4Tcr+ZZ9O17E4BOqm/zKircAtb3J94= =DnMK -----END PGP SIGNATURE----- --HafRawf+NxxCITJn--