* [PATCH 1/1] ethernet: atheros: fix return value check in atl1_tso()
@ 2023-07-20 14:41 Yuanjun Gong
2023-07-20 22:08 ` Kuniyuki Iwashima
0 siblings, 1 reply; 4+ messages in thread
From: Yuanjun Gong @ 2023-07-20 14:41 UTC (permalink / raw)
To: Chris Snook, David S . Miller, Eric Dumazet, Jakub Kicinski,
netdev
Cc: Yuanjun Gong
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().
Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
---
drivers/net/ethernet/atheros/atlx/atl1.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index c8444bcdf527..02aa6fd8ebc2 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -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;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 1/1] ethernet: atheros: fix return value check in atl1_tso()
2023-07-20 14:41 [PATCH 1/1] ethernet: atheros: fix return value check in atl1_tso() Yuanjun Gong
@ 2023-07-20 22:08 ` Kuniyuki Iwashima
2023-07-22 14:25 ` [PATCH net v2 1/1] " Yuanjun Gong
0 siblings, 1 reply; 4+ messages in thread
From: Kuniyuki Iwashima @ 2023-07-20 22:08 UTC (permalink / raw)
To: ruc_gongyuanjun; +Cc: chris.snook, davem, edumazet, kuba, netdev, kuniyu
From: Yuanjun Gong <ruc_gongyuanjun@163.com>
Date: Thu, 20 Jul 2023 22:41:54 +0800
> 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/20230720144208.39170-1-ruc_gongyuanjun@163.com/T/#u
https://lore.kernel.org/netdev/20230720144219.39285-1-ruc_gongyuanjun@163.com/T/#u
> Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
> ---
> drivers/net/ethernet/atheros/atlx/atl1.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
> index c8444bcdf527..02aa6fd8ebc2 100644
> --- a/drivers/net/ethernet/atheros/atlx/atl1.c
> +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
> @@ -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;
> --
> 2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH net v2 1/1] atheros: fix return value check in atl1_tso()
2023-07-20 22:08 ` Kuniyuki Iwashima
@ 2023-07-22 14:25 ` Yuanjun Gong
2023-07-24 22:50 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 4+ messages in thread
From: Yuanjun Gong @ 2023-07-22 14:25 UTC (permalink / raw)
To: kuniyu; +Cc: chris.snook, davem, edumazet, kuba, netdev, ruc_gongyuanjun
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")
Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
---
drivers/net/ethernet/atheros/atlx/atl1.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index c8444bcdf527..02aa6fd8ebc2 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -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;
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net v2 1/1] atheros: fix return value check in atl1_tso()
2023-07-22 14:25 ` [PATCH net v2 1/1] " Yuanjun Gong
@ 2023-07-24 22:50 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-07-24 22:50 UTC (permalink / raw)
To: Yuanjun Gong; +Cc: kuniyu, chris.snook, davem, edumazet, kuba, netdev
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
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")
> Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
>
> [...]
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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-24 22:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-20 14:41 [PATCH 1/1] ethernet: atheros: fix return value check in atl1_tso() Yuanjun Gong
2023-07-20 22:08 ` Kuniyuki Iwashima
2023-07-22 14:25 ` [PATCH net v2 1/1] " Yuanjun Gong
2023-07-24 22:50 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).