* [PATCH] net: ipv4: fix return value check in esp_remove_trailer
@ 2023-10-09 1:13 Ma Ke
2023-10-13 5:56 ` Steffen Klassert
0 siblings, 1 reply; 2+ messages in thread
From: Ma Ke @ 2023-10-09 1:13 UTC (permalink / raw)
To: steffen.klassert, herbert, davem, dsahern, edumazet, kuba, pabeni
Cc: netdev, linux-kernel, Ma Ke
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 <make_ruc2021@163.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: ipv4: fix return value check in esp_remove_trailer
2023-10-09 1:13 [PATCH] net: ipv4: fix return value check in esp_remove_trailer Ma Ke
@ 2023-10-13 5:56 ` Steffen Klassert
0 siblings, 0 replies; 2+ messages in thread
From: Steffen Klassert @ 2023-10-13 5:56 UTC (permalink / raw)
To: Ma Ke; +Cc: herbert, davem, dsahern, edumazet, kuba, pabeni, netdev,
linux-kernel
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 <make_ruc2021@163.com>
Also applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-13 5:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-09 1:13 [PATCH] net: ipv4: fix return value check in esp_remove_trailer Ma Ke
2023-10-13 5:56 ` Steffen Klassert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).