Skip to contentSkip to conversation

ethernet: atheros: fix return value check in atl1_tso()

PATCH New Yuanjun Gong 3 participants 4 messages Jul 20, 2023 – Jul 24, 2023

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

PATCH 1/1 ethernet: atheros: fix return value check in atl1_tso()

in atl1_tso, it should check the return value of pskb_trim(), and return an error code if an unexpected value is returned by pskb_trim().

---
 drivers/net/ethernet/atheros/atlx/atl1.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/atheros/atlx/atl1.c +5 -2
index c8444bcdf527..02aa6fd8ebc2 100644
@@ -2113,8 +2113,11 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,
 
 			real_len = (((unsigned char *)iph - skb->data) +
 				ntohs(iph->tot_len));
-			if (real_len < skb->len)
-				pskb_trim(skb, real_len);
+			if (real_len < skb->len) {
+				err = pskb_trim(skb, real_len);
+				if (err)
+					return err;
+			}
 			hdr_len = skb_tcp_all_headers(skb);
 			if (skb->len == hdr_len) {
 				iph->check = 0;
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 ethernet: atheros: fix return value check in atl1_tso()

From: Yuanjun Gong <[email protected]>
Date: Thu, 20 Jul 2023 22:41:54 +0800

Quoted 4 lines

in atl1_tso, it should check the return value of pskb_trim(), and return an error code if an unexpected value is returned by pskb_trim().

Please add Fixes tag and specify the target tree as net in Subject.

Also, it would be better to post related patches as a single series:

https://lore.kernel.org/netdev/[email protected]/T/#u
https://lore.kernel.org/netdev/[email protected]/T/#u

Quoted 25 lines
---
 drivers/net/ethernet/atheros/atlx/atl1.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/atheros/atlx/atl1.c +5 -2
index c8444bcdf527..02aa6fd8ebc2 100644
@@ -2113,8 +2113,11 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,
 
 			real_len = (((unsigned char *)iph - skb->data) +
 				ntohs(iph->tot_len));
-			if (real_len < skb->len)
-				pskb_trim(skb, real_len);
+			if (real_len < skb->len) {
+				err = pskb_trim(skb, real_len);
+				if (err)
+					return err;
+			}
 			hdr_len = skb_tcp_all_headers(skb);
 			if (skb->len == hdr_len) {
 				iph->check = 0;
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 1/1 atheros: fix return value check in atl1_tso()

in atl1_tso(), it should check the return value of pskb_trim(), and return an error code if an unexpected value is returned by pskb_trim().

Fixes 401c0aabec4b ("atl1: simplify tx packet descriptor")
---
 drivers/net/ethernet/atheros/atlx/atl1.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ethernet/atheros/atlx/atl1.c +5 -2
index c8444bcdf527..02aa6fd8ebc2 100644
@@ -2113,8 +2113,11 @@ static int atl1_tso(struct atl1_adapter *adapter, struct sk_buff *skb,
 
 			real_len = (((unsigned char *)iph - skb->data) +
 				ntohs(iph->tot_len));
-			if (real_len < skb->len)
-				pskb_trim(skb, real_len);
+			if (real_len < skb->len) {
+				err = pskb_trim(skb, real_len);
+				if (err)
+					return err;
+			}
 			hdr_len = skb_tcp_all_headers(skb);
 			if (skb->len == hdr_len) {
 				iph->check = 0;
Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH net v2 1/1] atheros: fix return value check in atl1_tso()

This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Sat, 22 Jul 2023 22:25:11 +0800 you wrote:

in atl1_tso(), it should check the return value of pskb_trim(), and return an error code if an unexpected value is returned by pskb_trim().

Fixes 401c0aabec4b ("atl1: simplify tx packet descriptor")

[...]

Here is the summary with links:
- [net,v2,1/1] atheros: fix return value check in atl1_tso()

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

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html