mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 11/18] misc: storage-by-uuid: consider only first diskuuid match
Date: Mon, 14 Apr 2025 08:31:45 +0200	[thread overview]
Message-ID: <20250414063152.2736649-12-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20250414063152.2736649-1-a.fatoum@pengutronix.de>

Multiple devices with the same disk UUID shouldn't happen and if it
does, the existing code is not equipped to handle that.

Change  it, so only the first _disk_ is considered. diskuuid is in a
union with partuuid and that could lead to cdev partition being taken as
backend storage instead.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/misc/storage-by-uuid.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/storage-by-uuid.c b/drivers/misc/storage-by-uuid.c
index 8b8fd901685e..7bb987dffbec 100644
--- a/drivers/misc/storage-by-uuid.c
+++ b/drivers/misc/storage-by-uuid.c
@@ -143,10 +143,14 @@ static void check_exist(struct sbu *sbu)
 	struct cdev *cdev;
 
 	for_each_cdev(cdev) {
-		if (!strcmp(cdev->diskuuid, sbu->uuid)) {
-			dev_dbg(sbu->dev, "Found %s %s\n", cdev->name, cdev->diskuuid);
-			storage_by_uuid_add_partitions(sbu, cdev);
-		}
+		if (cdev_is_partition(cdev))
+			continue;
+		if (strcmp(cdev->diskuuid, sbu->uuid))
+			continue;
+
+		dev_dbg(sbu->dev, "Found %s %s\n", cdev->name, cdev->diskuuid);
+		storage_by_uuid_add_partitions(sbu, cdev);
+		return;
 	}
 }
 
-- 
2.39.5




  parent reply	other threads:[~2025-04-14  6:36 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-14  6:31 [PATCH 00/18] boot: improve cdev alias and blspec support Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 01/18] cdev: make cdev_find_child_by_gpt_typeuuid external Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 02/18] cdev: constify cdev_find_child_by_gpt_typeuuid's guid_t pointer argument Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 03/18] partition: efi: respect DPS_TYPE_FLAG_NO_AUTO flag Ahmad Fatoum
2025-04-14 11:38   ` Sascha Hauer
2025-04-14  6:31 ` [PATCH 04/18] blspec: iterate over all XBOOTLDR partitions Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 05/18] blspec: support GPT XBOOTLDR partition Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 06/18] blspec: collect bootloader spec entries from ESP Ahmad Fatoum
2025-04-14 10:14   ` Marco Felsch
2025-04-14 10:19     ` Ahmad Fatoum
2025-04-14 10:41       ` Marco Felsch
2025-04-14  6:31 ` [PATCH 07/18] cdev: alias: add support for partition links Ahmad Fatoum
2025-04-14 10:17   ` Marco Felsch
2025-04-14 10:20     ` Ahmad Fatoum
2025-04-14 10:49       ` Marco Felsch
2025-04-14 13:28         ` Sascha Hauer
2025-04-14  6:31 ` [PATCH 08/18] cdev: do not dereference partname for non-partitions Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 09/18] cdev: use common cdev_free helper internally Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 10/18] cdev: implement devfs_create_link in terms of devfs_create Ahmad Fatoum
2025-04-14  6:31 ` Ahmad Fatoum [this message]
2025-04-14 10:24   ` [PATCH 11/18] misc: storage-by-uuid: consider only first diskuuid match Marco Felsch
2025-04-14 10:31     ` Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 12/18] misc: storage-by-uuid: prepare for generalizing to different aliases Ahmad Fatoum
2025-04-14 10:31   ` Marco Felsch
2025-04-14 10:35     ` Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 13/18] misc: storage-by-uuid: rename to storage-by-alias Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 14/18] misc: storage-by-alias: switch over to using cdev aliases Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 15/18] misc: storage-by-alias: add support barebox,bootsource Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 16/18] misc: storage-by-alias: register as link to main cdev Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 17/18] cdev: constify cdev_readlink argument Ahmad Fatoum
2025-04-14  6:31 ` [PATCH 18/18] cdev: follow links in cdev_find_child_by_gpt_typeuuid Ahmad Fatoum
2025-04-14 10:51 ` [PATCH 00/18] boot: improve cdev alias and blspec support Marco Felsch
2025-04-14 13:25 ` Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250414063152.2736649-12-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox