Commit 74da10a4 authored by Yuanjun Gong's avatar Yuanjun Gong Committed by sanglipeng
Browse files

net:ipv6: check return value of pskb_trim() 

stable inclusion
from stable-v5.10.188
commit d06fc7b39199e7d2930ff6de20e52fc6f0ee86f4
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8KYFP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d06fc7b39199e7d2930ff6de20e52fc6f0ee86f4



--------------------------------

[ Upstream commit 4258faa1 ]

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: default avatarYuanjun Gong <ruc_gongyuanjun@163.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 12aa432c

net/ipv6/ip6_gre.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}