net: ipv6: fix return value check in esp_remove_trailer

Ma Ke · klassert · commit dad4e491e30b · 2023-10-10T09:55:35.000+02:00
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 &lt;make_ruc2021@163.com&gt;
Signed-off-by: Steffen Klassert &lt;steffen.klassert@secunet.com&gt;
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
@@ -770,7 +770,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];
 

Original file line number	Diff line number	Diff line change
`@@ -770,7 +770,9 @@ static inline int esp_remove_trailer(struct sk_buff *skb)`
`770`	`770`	`skb->csum = csum_block_sub(skb->csum, csumdiff,`
`771`	`771`	`skb->len - trimlen);`
`772`	`772`	`}`
`773`		`- pskb_trim(skb, skb->len - trimlen);`
	`773`	`+ ret = pskb_trim(skb, skb->len - trimlen);`
	`774`	`+ if (unlikely(ret))`
	`775`	`+ return ret;`
`774`	`776`
`775`	`777`	`ret = nexthdr[1];`
`776`	`778`