Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-16 09:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

phy: Set phy->dev to NULL when generic_phy_get_by_name() fails

Browse source 
generic_phy_get_by_name() does not initialize phy->dev to NULL before
returning when dev_read_stringlist_search() fails. This can lead to an
uninitialized or reused struct phy erroneously be report as valid by
generic_phy_valid().

Fix this issue by initializing phy->dev to NULL, also extend the
dm_test_phy_base test with calls to generic_phy_valid().

Fixes: b9688df3cb ("drivers: phy: Set phy->dev to NULL when generic_phy_get_by_index() fails")
Fixes: 868d58f69c ("usb: dwc3: Fix non-usb3 configurations")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
This commit is contained in:
Jonas Karlman 2023-08-31 22:16:33 +00:00 • committed by Tom Rini
parent cba79a1b2e
commit feb4b919ab
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/phy/phy-uclass.c
View file

@ -211,6 +211,9 @@ int generic_phy_get_by_name(struct udevice *dev, const char *phy_name,
debug("%s(dev=%p, name=%s, phy=%p)\n", __func__, dev, phy_name, phy); debug("%s(dev=%p, name=%s, phy=%p)\n", __func__, dev, phy_name, phy);
assert(phy);
phy->dev = NULL;
index = dev_read_stringlist_search(dev, "phy-names", phy_name); index = dev_read_stringlist_search(dev, "phy-names", phy_name);
if (index < 0) { if (index < 0) {
debug("dev_read_stringlist_search() failed: %d\n", index); debug("dev_read_stringlist_search() failed: %d\n", index);

6
test/dm/phy.c
View file

@ -29,7 +29,9 @@ static int dm_test_phy_base(struct unit_test_state *uts)
* Get the same phy port in 2 different ways and compare. * Get the same phy port in 2 different ways and compare.
*/ */
ut_assertok(generic_phy_get_by_name(parent, "phy1", &phy1_method1)); ut_assertok(generic_phy_get_by_name(parent, "phy1", &phy1_method1));
ut_assert(generic_phy_valid(&phy1_method1));
ut_assertok(generic_phy_get_by_index(parent, 0, &phy1_method2)); ut_assertok(generic_phy_get_by_index(parent, 0, &phy1_method2));
ut_assert(generic_phy_valid(&phy1_method2));
ut_asserteq(phy1_method1.id, phy1_method2.id); ut_asserteq(phy1_method1.id, phy1_method2.id);
/* /*
@ -50,6 +52,10 @@ static int dm_test_phy_base(struct unit_test_state *uts)
ut_asserteq(-ENODEV, uclass_get_device(UCLASS_PHY, 4, &dev)); ut_asserteq(-ENODEV, uclass_get_device(UCLASS_PHY, 4, &dev));
ut_asserteq(-ENODATA, generic_phy_get_by_name(parent, ut_asserteq(-ENODATA, generic_phy_get_by_name(parent,
"phy_not_existing", &phy1_method1)); "phy_not_existing", &phy1_method1));
ut_assert(!generic_phy_valid(&phy1_method1));
ut_asserteq(-ENOENT, generic_phy_get_by_index(parent, 3,
&phy1_method2));
ut_assert(!generic_phy_valid(&phy1_method2));
return 0; return 0;
} }