Skip to contentSkip to conversation

myri10ge: fix an incorrect free for skb in myri10ge_sw_tso

PATCH Applied Xiaomeng Tong 4 participants 5 messages Apr 6, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 myri10ge: fix an incorrect free for skb in myri10ge_sw_tso

All remaining skbs should be released when myri10ge_xmit fails to transmit a packet. Fix it within another skb_list_walk_safe.

---

changes since v2:
- free all remaining skbs. (Xiaomeng Tong)

changes since v1:
- remove the unneeded assignmnets. (Xiaomeng Tong)

v2:https://lore.kernel.org/lkml/[email protected]/ v1:https://lore.kernel.org/lkml/[email protected]/

---
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +2 -4
index 50ac3ee2577a..21d2645885ce 100644
@@ -2903,11 +2903,9 @@ static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb,
 		status = myri10ge_xmit(curr, dev);
 		if (status != 0) {
 			dev_kfree_skb_any(curr);
-			if (segs != NULL) {
-				curr = segs;
-				segs = next;
+			skb_list_walk_safe(next, curr, next) {
 				curr->next = NULL;
-				dev_kfree_skb_any(segs);
+				dev_kfree_skb_any(curr);
 			}
 			goto drop;
 		}
Signature · 1 line
2.17.1
#1 lore raw

4/6/22 06:55, Xiaomeng Tong пишет:

Quoted 24 lines

All remaining skbs should be released when myri10ge_xmit fails to transmit a packet. Fix it within another skb_list_walk_safe.

---

changes since v2:
- free all remaining skbs. (Xiaomeng Tong)

changes since v1:
- remove the unneeded assignmnets. (Xiaomeng Tong)

v2:https://lore.kernel.org/lkml/[email protected]/ v1:https://lore.kernel.org/lkml/[email protected]/

---
  drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +0 -0
index 50ac3ee2577a..21d2645885ce 100644

drivers/net/ethernet/myricom/myri10ge/myri10ge.c static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb, · line 2908

Quoted 10 lines
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +2 -4
@@ -2903,11 +2903,9 @@ static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb,
  		status = myri10ge_xmit(curr, dev);
  		if (status != 0) {
  			dev_kfree_skb_any(curr);
-			if (segs != NULL) {
-				curr = segs;
-				segs = next;
+			skb_list_walk_safe(next, curr, next) {
  				curr->next = NULL;
-				dev_kfree_skb_any(segs);
+				dev_kfree_skb_any(curr);

why can't we just do the following?

        skb_list_walk_safe(segs, skb, nskb) {
                status = myri10ge_xmit(curr, dev);
                if (err)
                        break;

        }

        /* Free all of the segments. */
        skb_list_walk_safe(segs, skb, nskb) {
                if (err)
                        kfree_skb(skb);
                else
                        consume_skb(skb);
        }
        return err;
Quoted 3 lines
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +0 -0
  			}
  			goto drop;
  		}
#2 lore raw
In reply to Xiaomeng Tong

4/6/22 06:55, Xiaomeng Tong пишет:

Quoted 24 lines

All remaining skbs should be released when myri10ge_xmit fails to transmit a packet. Fix it within another skb_list_walk_safe.

---

changes since v2:
- free all remaining skbs. (Xiaomeng Tong)

changes since v1:
- remove the unneeded assignmnets. (Xiaomeng Tong)

v2:https://lore.kernel.org/lkml/[email protected]/ v1:https://lore.kernel.org/lkml/[email protected]/

---
  drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +0 -0
index 50ac3ee2577a..21d2645885ce 100644

drivers/net/ethernet/myricom/myri10ge/myri10ge.c static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb, · line 2904

Quoted 2 lines
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +0 -0
@@ -2903,11 +2903,9 @@ static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb,
  		status = myri10ge_xmit(curr, dev);
  		if (status != 0) {

a transmit function returns NETDEV_TX_OK on success

Quoted 11 lines
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +2 -4
  			dev_kfree_skb_any(curr);
-			if (segs != NULL) {
-				curr = segs;
-				segs = next;
+			skb_list_walk_safe(next, curr, next) {
  				curr->next = NULL;
-				dev_kfree_skb_any(segs);
+				dev_kfree_skb_any(curr);
  			}
  			goto drop;
  		}
#3 lore raw
In reply to Xiaomeng Tong
This patch was applied to netdev/net.git (master) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

Quoted 10 lines · On Wed, 6 Apr 2022 11:55:56 +0800 you wrote:

All remaining skbs should be released when myri10ge_xmit fails to transmit a packet. Fix it within another skb_list_walk_safe.

---

changes since v2:
- free all remaining skbs. (Xiaomeng Tong)

[...]

Here is the summary with links:
- [v3] myri10ge: fix an incorrect free for skb in myri10ge_sw_tso

    https://git.kernel.org/netdev/net/c/b423e54ba965

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
maintainer
#4 lore raw
In reply to Xiaomeng Tong
Quoted 2 lines · On Wed, 6 Apr 2022 11:55:56 +0800 Xiaomeng Tong wrote:

All remaining skbs should be released when myri10ge_xmit fails to transmit a packet. Fix it within another skb_list_walk_safe.

I think it was also a UAF.

Quoted 8 lines
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +0 -0
index 50ac3ee2577a..21d2645885ce 100644
@@ -2903,11 +2903,9 @@ static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb,
 		status = myri10ge_xmit(curr, dev);
 		if (status != 0) {
 			dev_kfree_skb_any(curr);

drivers/net/ethernet/myricom/myri10ge/myri10ge.c static netdev_tx_t myri10ge_sw_tso(struct sk_buff *skb, · line 2911

Quoted 10 lines
drivers/net/ethernet/myricom/myri10ge/myri10ge.c +2 -4
-			if (segs != NULL) {
-				curr = segs;
-				segs = next;
+			skb_list_walk_safe(next, curr, next) {
 				curr->next = NULL;
-				dev_kfree_skb_any(segs);
+				dev_kfree_skb_any(curr);
 			}
 			goto drop;
 		}

Much better, thanks.

kfree_skb_list() exists but the patch was already applied, so whatever.