projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc9b364
)
net: ipv6: fix return value check in esp_remove_trailer
author
Ma Ke
<make_ruc2021@163.com>
Sat, 7 Oct 2023 00:59:53 +0000
(08:59 +0800)
committer
Steffen Klassert
<steffen.klassert@secunet.com>
Tue, 10 Oct 2023 07:55:35 +0000
(09:55 +0200)
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>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
net/ipv6/esp6.c
patch
|
blob
|
history
diff --git
a/net/ipv6/esp6.c
b/net/ipv6/esp6.c
index
fddd0cb
..
e023d29
100644
(file)
--- 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];