projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bce5603
)
ipv4: ip_gre: fix return value check in erspan_fb_xmit()
author
Yuanjun Gong
<ruc_gongyuanjun@163.com>
Mon, 17 Jul 2023 14:49:02 +0000
(22:49 +0800)
committer
David S. Miller
<davem@davemloft.net>
Wed, 19 Jul 2023 11:27:09 +0000
(12:27 +0100)
goto err_free_skb if an unexpected result is returned by pskb_tirm()
in erspan_fb_xmit().
Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@163.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_gre.c
patch
|
blob
|
blame
|
history
diff --git
a/net/ipv4/ip_gre.c
b/net/ipv4/ip_gre.c
index 81a1cce1a7d110849e02eba6207d994ca01cfbf1..914cc941af551e09b8b730b3a21f0466d2f65bea 100644
(file)
--- a/
net/ipv4/ip_gre.c
+++ b/
net/ipv4/ip_gre.c
@@
-548,7
+548,8
@@
static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev)
goto err_free_skb;
if (skb->len > dev->mtu + dev->hard_header_len) {
- pskb_trim(skb, dev->mtu + dev->hard_header_len);
+ if (pskb_trim(skb, dev->mtu + dev->hard_header_len))
+ goto err_free_skb;
truncate = true;
}