lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: skb_share_check() should use consume_skb()

Browse Source 
In order to avoid false drop_monitor indications, we should
call consume_skb() if skb_clone() was successful.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet
2012-08-03 20:54:15 +00:00
committed by David S. Miller
parent cc72d100a3
commit 47061bc440
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/skbuff.h
View File

@@ -846,12 +846,15 @@ static inline int skb_shared(const struct sk_buff *skb)
* *
* NULL is returned on a memory allocation failure. * NULL is returned on a memory allocation failure.
*/ */
static inline struct sk_buff *skb_share_check(struct sk_buff *skb, static inline struct sk_buff *skb_share_check(struct sk_buff *skb, gfp_t pri)
gfp_t pri)
{ {
might_sleep_if(pri & __GFP_WAIT); might_sleep_if(pri & __GFP_WAIT);
if (skb_shared(skb)) { if (skb_shared(skb)) {
struct sk_buff *nskb = skb_clone(skb, pri); struct sk_buff *nskb = skb_clone(skb, pri);
if (likely(nskb))
consume_skb(skb);
else
kfree_skb(skb); kfree_skb(skb);
skb = nskb; skb = nskb;
} }