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

Commit 03b88b7d authored by Ma Ke's avatar Ma Ke Committed by Greg Kroah-Hartman
Browse files

net: ipv4: fix return value check in esp_remove_trailer 



commit 513f61e2193350c7a345da98559b80f61aec4fa6 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 0cb7b894

net/ipv4/esp4.c

+3 −1
Original line number Diff line number Diff line
@@ -567,7 +567,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];