Skip to contentSkip to conversation

net: Fix memory corruption in eth_halt() if the stop handler frees the priv member

PATCH In review Bernhard Rosenkränzer 2 participants 2 messages Dec 12, 2022 Networking

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: Fix memory corruption in eth_halt() if the stop handler frees the priv member

Calling eth_halt() could result in memory corruption if the stop() handler frees or modifies the priv member.

A stored value of dev_get_uclass_priv() is assumed to remain valid after the stop() handler has been called, which is not always the case (e.g. rndis over usb gadget).

Re-check the priv pointer after calling the stop() handler.

---
 net/eth-uclass.c | 5 +++++
 1 file changed, 5 insertions(+)
net/eth-uclass.c +5 -0
index f41da4b37b..410f3310c7 100644
@@ -343,6 +343,11 @@ void eth_halt(void)
 		return;
 
 	eth_get_ops(current)->stop(current);
+
+	priv = dev_get_uclass_priv(current);
+	if (!priv || !priv->running)
+		return;
+
 	priv->state = ETH_STATE_PASSIVE;
 	priv->running = false;
 }
Signature · 1 line
2.38.1
#1 lore raw

Hi Bernhard,

Quoted 20 lines · Bernhard Rosenkränzer

Calling eth_halt() could result in memory corruption if the stop() handler frees or modifies the priv member.

A stored value of dev_get_uclass_priv() is assumed to remain valid after the stop() handler has been called, which is not always the case (e.g. rndis over usb gadget).

Re-check the priv pointer after calling the stop() handler.

---
 net/eth-uclass.c | 5 +++++
 1 file changed, 5 insertions(+)
net/eth-uclass.c +0 -0
index f41da4b37b..410f3310c7 100644

net/eth-uclass.c void eth_halt(void) · line 350

Quoted 8 lines
net/eth-uclass.c +5 -0
@@ -343,6 +343,11 @@ void eth_halt(void)
                return;
 
        eth_get_ops(current)->stop(current);
+
+       priv = dev_get_uclass_priv(current);
+       if (!priv || !priv->running)
+               return;
+

Niel submitted the same fix:
https://lists.denx.de/pipermail/u-boot/2022-December/502055.html