---

yaml --- r: 315783 b: refs/heads/master c: 1080e51 h: refs/heads/master i: 315781: 77556b9 315779: e860053 315775: c209776 v: v3
git-mirror · Jul 22, 2012 · 924d30e · 924d30e
1 parent 16c14f1
commit 924d30e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 868eefeb17d40f6acde00ad8165a268529cf6d24
+refs/heads/master: 1080e512d44d4f67b8beb8edf25a1bbcb1066dc7
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1632,6 +1632,8 @@ static inline int deliver_skb(struct sk_buff *skb,
 			      struct packet_type *pt_prev,
 			      struct net_device *orig_dev)
 {
+	if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))
+		return -ENOMEM;
 	atomic_inc(&skb->users);
 	return pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
 }
@@ -3262,7 +3264,10 @@ static int __netif_receive_skb(struct sk_buff *skb)
 	}
 
 	if (pt_prev) {
-		ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
+		if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))
+			ret = -ENOMEM;
+		else
+			ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
 	} else {
 		atomic_long_inc(&skb->dev->rx_dropped);
 		kfree_skb(skb);