Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2756641a authored by Ma Ke's avatar Ma Ke Committed by Greg Kroah-Hartman
Browse files

net: ipv6: fix return value check in esp_remove_trailer 



commit dad4e491e30b20f4dc615c9da65d2142d703b5c2 upstream.

In esp_remove_trailer(), to avoid an unexpected result returned by
pskb_trim, we should check the return value of pskb_trim().

Signed-off-by: default avatarMa Ke <make_ruc2021@163.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8cd11a02

net/ipv6/esp6.c

+3 −1
Original line number Diff line number Diff line
@@ -517,7 +517,9 @@ static inline int esp_remove_trailer(struct sk_buff *skb) 
		skb->csum = csum_block_sub(skb->csum, csumdiff,

					   skb->len - trimlen);

	}

	pskb_trim(skb, skb->len - trimlen);

	ret = pskb_trim(skb, skb->len - trimlen);

	if (unlikely(ret))

		return ret;



	ret = nexthdr[1];