| Message ID | 20230722142511.12448-1-ruc_gongyuanjun@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ed96824b71ed67664390890441b229423a25317f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2,1/1] atheros: fix return value check in atl1_tso() | expand |
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!
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;
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(-)