| Message ID | 20230720144208.39170-1-ruc_gongyuanjun@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8d01da0a1db237c44c92859ce3612df7af8d3a53 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/1] ethernet: atheros: fix return value check in atl1c_tso_csum() | expand |
On Thu, Jul 20, 2023 at 10:42:08PM +0800, Yuanjun Gong wrote: > in atl1c_tso_csum, 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> Reviewed-by: Simon Horman <simon.horman@corigine.com>
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 20 Jul 2023 22:42:08 +0800 you wrote: > in atl1c_tso_csum, 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/atl1c/atl1c_main.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) Here is the summary with links: - [1/1] ethernet: atheros: fix return value check in atl1c_tso_csum() https://git.kernel.org/netdev/net/c/8d01da0a1db2 You are awesome, thank you!
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 4a288799633f..940c5d1ff9cf 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c @@ -2094,8 +2094,11 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter, real_len = (((unsigned char *)ip_hdr(skb) - skb->data) + ntohs(ip_hdr(skb)->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 (unlikely(skb->len == hdr_len)) {
in atl1c_tso_csum, 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/atl1c/atl1c_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)