* [PATCH 1/1] net:ipv6: check return value of pskb_trim()
@ 2023-07-15 9:46 Yuanjun Gong
2023-07-15 15:03 ` David Ahern
0 siblings, 1 reply; 2+ messages in thread
From: Yuanjun Gong @ 2023-07-15 9:46 UTC (permalink / raw)
To: Yuanjun Gong, David S . Miller, David Ahern, netdev
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 | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index da80974ad23a..92220b02e99f 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -955,8 +955,10 @@ 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);
- truncate = true;
+ if (pskb_trim(skb, dev->mtu + dev->hard_header_len))
+ goto tx_err;
+ else
+ truncate = true;
}
nhoff = skb_network_offset(skb);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH 1/1] net:ipv6: check return value of pskb_trim()
2023-07-15 9:46 [PATCH 1/1] net:ipv6: check return value of pskb_trim() Yuanjun Gong
@ 2023-07-15 15:03 ` David Ahern
0 siblings, 0 replies; 2+ messages in thread
From: David Ahern @ 2023-07-15 15:03 UTC (permalink / raw)
To: Yuanjun Gong, David S . Miller, netdev
On 7/15/23 3:46 AM, Yuanjun Gong wrote:
> goto tx_err if an unexpected result is returned by pskb_tirm()
s/pskb_tirm/pskb_trim/
> in ip6erspan_tunnel_xmit().
>
> Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
> ---
> net/ipv6/ip6_gre.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
> index da80974ad23a..92220b02e99f 100644
> --- a/net/ipv6/ip6_gre.c
> +++ b/net/ipv6/ip6_gre.c
> @@ -955,8 +955,10 @@ 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);
> - truncate = true;
> + if (pskb_trim(skb, dev->mtu + dev->hard_header_len))
> + goto tx_err;
> + else
> + truncate = true;
> }
>
> nhoff = skb_network_offset(skb);
no need for the `else`:
if (pskb_trim(skb, dev->mtu + dev->hard_header_len))
goto tx_err;
truncate = true;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-07-15 15:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-15 9:46 [PATCH 1/1] net:ipv6: check return value of pskb_trim() Yuanjun Gong
2023-07-15 15:03 ` David Ahern
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).