From 0f5122279b976fb6de829ef772b69968407f8723 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 19 Apr 2005 22:48:59 -0700
Subject: [PATCH] --- yaml --- r: 339 b: refs/heads/master c:
 4d78b6c78ae6d87e4c1c8072f42efa716f04afb9 h: refs/heads/master i:   337:
 1b7a544f0c696477b933a9cafb657c7d26fe9283   335:
 115ea9198437cbffb0025d11d7e9b77f5c1bde4e v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv4/udp.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bc2c84e5e46d..b520e43e3f3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7f905f0f6d49ed8c1aa4566c31f0383a0ba0c9d
+refs/heads/master: 4d78b6c78ae6d87e4c1c8072f42efa716f04afb9
diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
index 6baddfbedca3..8a213238f287 100644
--- a/trunk/net/ipv4/udp.c
+++ b/trunk/net/ipv4/udp.c
@@ -955,6 +955,8 @@ static int udp_encap_rcv(struct sock * sk, struct sk_buff *skb)
 	 * header and optional ESP marker bytes) and then modify the
 	 * protocol to ESP, and then call into the transform receiver.
 	 */
+	if (skb_cloned(skb) && pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
+		return 0;
 
 	/* Now we can update and verify the packet length... */
 	iph = skb->nh.iph;