Commit 0c0bd978 authored Jul 17, 2023 by Yuanjun Gong Committed by Greg Kroah-Hartman Jul 27, 2023

net:ipv6: check return value of pskb_trim()



[ Upstream commit 4258faa130be4ea43e5e2d839467da421b8ff274 ]

goto tx_err if an unexpected result is returned by pskb_tirm()
in ip6erspan_tunnel_xmit().

Fixes: 5a963eb6 ("ip6_gre: Add ERSPAN native tunnel support")
Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 17046107

net/ipv6/ip6_gre.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -941,7 +941,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;
		}