Patchwork [net-next] net: skb_share_check() should use consume_skb()

login
register
mail settings
Submitter Eric Dumazet
Date Aug. 4, 2012, 6:54 a.m.
Message ID <1344063255.9299.1457.camel@edumazet-glaptop>
Download mbox | patch
Permalink /patch/175075/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Aug. 4, 2012, 6:54 a.m.
From: Eric Dumazet <edumazet@google.com>

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>
---
 include/linux/skbuff.h |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Aug. 4, 2012, 8:28 a.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 04 Aug 2012 08:54:15 +0200

> From: Eric Dumazet <edumazet@google.com>
> 
> 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>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7632c87..b33a3a1 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -846,13 +846,16 @@  static inline int skb_shared(const struct sk_buff *skb)
  *
  *	NULL is returned on a memory allocation failure.
  */
-static inline struct sk_buff *skb_share_check(struct sk_buff *skb,
-					      gfp_t pri)
+static inline struct sk_buff *skb_share_check(struct sk_buff *skb, gfp_t pri)
 {
 	might_sleep_if(pri & __GFP_WAIT);
 	if (skb_shared(skb)) {
 		struct sk_buff *nskb = skb_clone(skb, pri);
-		kfree_skb(skb);
+
+		if (likely(nskb))
+			consume_skb(skb);
+		else
+			kfree_skb(skb);
 		skb = nskb;
 	}
 	return skb;