[PATCH] net: ipv4: fix return value check in esp_remove_trailer

Subsystems: networking [general], networking [ipsec], the rest

STALE1041d

2 messages, 2 authors, 2023-10-13 · open the first message on its own page

[PATCH] net: ipv4: fix return value check in esp_remove_trailer

From: Ma Ke <hidden>
Date: 2023-10-09 01:15:07

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: Ma Ke <redacted>
---
 net/ipv4/esp4.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 2be2d4922557..d18f0f092fe7 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -732,7 +732,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];
 
-- 
2.37.2

Re: [PATCH] net: ipv4: fix return value check in esp_remove_trailer

From: Steffen Klassert <steffen.klassert@secunet.com>
Date: 2023-10-13 05:56:35

On Mon, Oct 09, 2023 at 09:13:37AM +0800, Ma Ke wrote:
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: Ma Ke <redacted>
Also applied, thanks!
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help