| Message ID | 20230717144519.21740-1-ruc_gongyuanjun@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4258faa130be4ea43e5e2d839467da421b8ff274 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,1/1] net:ipv6: check return value of pskb_trim() | expand |
On 7/17/23 8:45 AM, Yuanjun Gong wrote: > goto tx_err if an unexpected result is returned by pskb_tirm() > in ip6erspan_tunnel_xmit(). > > Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> > --- > net/ipv6/ip6_gre.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c > index da80974ad23a..070d87abf7c0 100644 > --- a/net/ipv6/ip6_gre.c > +++ b/net/ipv6/ip6_gre.c > @@ -955,7 +955,8 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, > goto tx_err; > > if (skb->len > dev->mtu + dev->hard_header_len) { > - pskb_trim(skb, dev->mtu + dev->hard_header_len); > + if (pskb_trim(skb, dev->mtu + dev->hard_header_len)) > + goto tx_err; > truncate = true; > } > Reviewed-by: David Ahern <dsahern@kernel.org>
From: Yuanjun Gong <ruc_gongyuanjun@163.com> Date: Mon, 17 Jul 2023 22:45:19 +0800 > goto tx_err if an unexpected result is returned by pskb_tirm() > in ip6erspan_tunnel_xmit(). > > Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> Fixes: 5a963eb61b7c ("ip6_gre: Add ERSPAN native tunnel support") Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com> Please keep these in mind for an acutual fix from next time. * Add Fixes: tag in changelog * Specify target tree as net in mail subject See also Documentation/process/maintainer-netdev.rst Thanks! > --- > net/ipv6/ip6_gre.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c > index da80974ad23a..070d87abf7c0 100644 > --- a/net/ipv6/ip6_gre.c > +++ b/net/ipv6/ip6_gre.c > @@ -955,7 +955,8 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, > goto tx_err; > > if (skb->len > dev->mtu + dev->hard_header_len) { > - pskb_trim(skb, dev->mtu + dev->hard_header_len); > + if (pskb_trim(skb, dev->mtu + dev->hard_header_len)) > + goto tx_err; > truncate = true; > } > > -- > 2.17.1
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Mon, 17 Jul 2023 22:45:19 +0800 you wrote: > goto tx_err if an unexpected result is returned by pskb_tirm() > in ip6erspan_tunnel_xmit(). > > Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> > --- > net/ipv6/ip6_gre.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Here is the summary with links: - [v2,1/1] net:ipv6: check return value of pskb_trim() https://git.kernel.org/netdev/net/c/4258faa130be You are awesome, thank you!
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index da80974ad23a..070d87abf7c0 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -955,7 +955,8 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, goto tx_err; if (skb->len > dev->mtu + dev->hard_header_len) { - pskb_trim(skb, dev->mtu + dev->hard_header_len); + if (pskb_trim(skb, dev->mtu + dev->hard_header_len)) + goto tx_err; truncate = true; }
goto tx_err if an unexpected result is returned by pskb_tirm() in ip6erspan_tunnel_xmit(). Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com> --- net/ipv6/ip6_gre.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)