---

yaml --- r: 315782 b: refs/heads/master c: 868eefe h: refs/heads/master v: v3
git-mirror · Jul 22, 2012 · 16c14f1 · 16c14f1
1 parent 77556b9
commit 16c14f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70008aa50e927670ceee7f0c87e159ca7b1517a2
+refs/heads/master: 868eefeb17d40f6acde00ad8165a268529cf6d24
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
@@ -416,6 +416,8 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	/* Orphan the skb - required as we might hang on to it
 	 * for indefinite time. */
+	if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))
+		goto drop;
 	skb_orphan(skb);
 
 	/* Enqueue packet */