diff --git a/[refs] b/[refs]
index 38eba4105c0e..2551d0509c9c 100644
--- 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
index f3a454c3295a..b95a7f44a6d8 100644
--- 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 */