From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 57959C83F10 for ; Sun, 27 Aug 2023 12:10:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qaEaL-0001JW-09; Sun, 27 Aug 2023 08:09:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qaEaI-0001Ix-Qw for grub-devel@gnu.org; Sun, 27 Aug 2023 08:09:38 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qaEaF-0002MU-3l for grub-devel@gnu.org; Sun, 27 Aug 2023 08:09:38 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id C2FDA5C009F; Sun, 27 Aug 2023 08:09:11 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sun, 27 Aug 2023 08:09:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-type: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=1693138151; x=1693224551; bh=eE B6f3roWFeBPlmvUAQEeJMpVIietJ8yvO3uYM2knQU=; b=Lf06pEp1aBh8PbIBKS Dtcm68/2WdskrMmJHlJobeVirXrC19tK8gdQXSpW1P2gsJCS6SYb6KHwYa4STc2v AJGv8b0ueCStDftmC9Q1sGbWx553tNnp4GBSiih9Ue3y0TX8QDVmoECdfbRmv5WT WQj3S4RmGzEuWyraiNXKGPqR1OU9pFCDPSCwPTapRNV7U0qUBV8AoLbVOCtjHGUw tSvALo0G2/Vz4+ttKGcvDnfsDyDN90aYAJbNRWNRRFfJqOWeaJ/+vQQy9N/4H+xY CLnsUdAuY3cfRCPWrd8AQNtEkwAeIcoSJnacxrxqoMs/euJEDxGTqGQv9WOh7vCJ Wabw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type: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=1693138151; x=1693224551; bh=eEB6f3roWFeBP lmvUAQEeJMpVIietJ8yvO3uYM2knQU=; b=jKOah/S9c369ff6aBPAdj9dJ0MLm6 zsMub5LG/qkKbsoFPHY7KTdpO0c6IdR7L1xyBgZ6RI5cTDYqtvDK7TzVBpDwUxbD TymXT5pldaXOQTpNjHoYUz4GtRFsmlA6TVMVyMZ8U4XRechM/wBsP/dQi4cyUS+9 zvroUZfOjgww5dDUjOmMhjWTLN1taYFjRa+APEzrrtdMrI6wWyFu+e/X162R3dZQ lZKPVVYkiU7+eCUYON4s7B5Uzp4XsHZixyH4yB9kNNbVuN1nCde9QlI1N6YFMgyV ciSwlVonsmx+6mGTTwnl6j0ekRKMmpd/R+1o59BqMYeA5HmwqtpWIDcQA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudefvddggeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepueektdevtdffveeljeetgfehheeigeekleduvdeffeeghefgledttdehjeelffet necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhsse hpkhhsrdhimh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 27 Aug 2023 08:09:10 -0400 (EDT) Received: by pks.im (OpenSMTPD) with ESMTPSA id 6b34d939 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 27 Aug 2023 12:06:33 +0000 (UTC) Date: Sun, 27 Aug 2023 14:09:08 +0200 From: Patrick Steinhardt To: Glenn Washburn Cc: grub-devel@gnu.org, Daniel Kiper , Olaf Hering Subject: Re: [PATCH] disk/cryptodisk: Fix missing change when updating to use grub_uuidcasecmp Message-ID: References: <20230818172722.2698000-1-development@efficientek.com> MIME-Version: 1.0 In-Reply-To: <20230818172722.2698000-1-development@efficientek.com> Received-SPF: pass client-ip=66.111.4.26; envelope-from=ps@pks.im; helo=out2-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, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Content-Type: multipart/mixed; boundary="===============3915814162843144785==" Errors-To: grub-devel-bounces+grub-devel=archiver.kernel.org@gnu.org Sender: grub-devel-bounces+grub-devel=archiver.kernel.org@gnu.org --===============3915814162843144785== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="/K5GGmspdLQbGhYk" Content-Disposition: inline --/K5GGmspdLQbGhYk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Aug 18, 2023 at 12:27:22PM -0500, Glenn Washburn wrote: > This was causing the cryptomount command to return failure even though > the crypto device was successfully added. Of course, this meant that any > script using the return code would behave unexpectedly. >=20 > Fixes: 3cf2e848bc03 (disk/cryptodisk: Allows UUIDs to be compared in a da= sh-insensitive manner) >=20 > Suggested-by: Olaf Hering > Signed-off-by: Glenn Washburn This change looks good to me, thanks! Reviewed-by: Patrich Steinhardt > --- > grub-core/disk/cryptodisk.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c > index 34b67a705fbc..fb807e2a6a27 100644 > --- a/grub-core/disk/cryptodisk.c > +++ b/grub-core/disk/cryptodisk.c > @@ -1236,7 +1236,8 @@ grub_cryptodisk_scan_device (const char *name, > dev =3D grub_cryptodisk_scan_device_real (name, source, cargs); > if (dev) > { > - ret =3D (cargs->search_uuid !=3D NULL && grub_strcasecmp (cargs->s= earch_uuid, dev->uuid) =3D=3D 0); > + ret =3D (cargs->search_uuid !=3D NULL > + && grub_uuidcasecmp (cargs->search_uuid, dev->uuid, sizeof (dev->u= uid)) =3D=3D 0); > goto cleanup; > } > =20 > --=20 > 2.34.1 >=20 --/K5GGmspdLQbGhYk Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF9hrgiFbCdvenl/rVbJhu7ckPpQFAmTrPOMACgkQVbJhu7ck PpTv1w//YBvi59VnrW64lQ14Bx6Bx4IXzw0uGHLd6XYpWnxJmDyl8C+yj+Mtyb3l VqcyUNIXuGLBG1lcS6W9iriCP/YRe0oNg4AhNVEl+6BaKHeXEy+JiN6P3TiDghQQ JFqXxN10H+YAmzCjaPhRZnXw6VpJAbHoj8DluHkBEgKspyiJN4eK3Kw3loUbn9KD 7jV3YLmGeiM0bzt9/qKk6el5UErDC4zQdzO1qZvNuZO9ynXiVTvOFecLSBxtUs+m aUkhnBgLNDj9W2hgGf+Td7zy24GvVG2aiiQYAo5ZCENZGUhPwVIWmAn5vX7GOWFI gys86SFEDIpdg51J5dsw3GpHovnxF0Zqc58Brl6IFRFoHv/MuRK71CiJJ78dyLwV MfeJyGRmA0wvbjRvZP0D4O/SImjiLsX7ONHf5XIAvByDhJ3IKoSbYD+wjY7UBM4o wps0nbhs4zUYPzgRX+dr/XXJpcN7PTtfV0lfh4FMScCkJeZun8XIy137/Nh+z17J qH7rUgXkNtXsQn1SWLbTmK+aBAfgds/92MkFmIxpCDSHTChwQH9jia8lHEwZkGuM TgSmhjQ8SNs1Xs7SQv3vkJpEG15tirWzg7wTBSv5HIjuZwyB4sNVxEr0H1upkYdQ awZG1UnvdiAJewrtPIoUgNIa2rgUz98GzQxcxcqeeftRcGjfQT0= =PdJC -----END PGP SIGNATURE----- --/K5GGmspdLQbGhYk-- --===============3915814162843144785== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KR3J1Yi1kZXZl bCBtYWlsaW5nIGxpc3QKR3J1Yi1kZXZlbEBnbnUub3JnCmh0dHBzOi8vbGlzdHMuZ251Lm9yZy9t YWlsbWFuL2xpc3RpbmZvL2dydWItZGV2ZWwK --===============3915814162843144785==--