From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: oss-tools@pengutronix.de
Subject: [OSS-Tools] [PATCH] libdt: fix of_get_devicepath looking up sibling if device unavailable
Date: Wed, 7 Jun 2023 10:08:18 +0200 [thread overview]
Message-ID: <20230607080818.715192-1-a.fatoum@pengutronix.de> (raw)
of_get_devicepath code flow is split into two:
A) Either the device tree node in question has a direct udev_device
associated with it
B) Or we assume it's a partition and lookup udev_device for the parent
first, before finding a child udev_device or setting a partition
offset within the parent udev_device.
Since v2017.03.0, we have had a fallthrough from case A into case B:
If we have a udev_device, but it's neither a EEPROMs, MTDs or block
device, we just consider it a partition. This is problematic, because
this may result in us pointing at a very different device:
- backend points at a SD-Card host. Host is enabled, but SD-Card
is not inserted, so no block device
- case A fails, so it's assumed it's a partition and case B
uses parent SoC bus to lookup appropriate device
- We fall through into the second device_find_block_device, which
will take the first matching block device across the SoC. So
we could end up with the eMMC: a completely different device
than what was pointed at.
Fixes: 929ed64cb42f ("of_get_devicepath: make partition finding more robust")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
src/libdt.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/libdt.c b/src/libdt.c
index e54d7fb5649d..7b99efe5b2de 100644
--- a/src/libdt.c
+++ b/src/libdt.c
@@ -2492,9 +2492,11 @@ int of_get_devicepath(struct device_node *partition_node, char **devpath, off_t
}
/*
- * If we found a device but couldn't classify it above, we fall
- * through.
+ * If we find a udev_device but couldn't classify it above,
+ * it's an error. Falling through would mean to handle it as a
+ * partition and could lead us to return an arbitrary sibling device
*/
+ return -ENODEV;
}
/*
--
2.39.2
next reply other threads:[~2023-06-07 8:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 8:08 Ahmad Fatoum [this message]
2023-06-07 8:55 ` Uwe Kleine-König
2023-06-07 9:00 ` Ahmad Fatoum
2023-06-07 11:02 ` Ahmad Fatoum
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=20230607080818.715192-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=oss-tools@pengutronix.de \
/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