From e59ba146b00e97ee64e1738f426f7081c5a29a08 Mon Sep 17 00:00:00 2001
From: Tony Cheneau <tony.cheneau@amnesiak.org>
Date: Wed, 11 Jul 2012 06:51:14 +0000
Subject: [PATCH] --- yaml --- r: 315381 b: refs/heads/master c:
 d4787a15432384826a0bed42d189fc2a97dc73ea h: refs/heads/master i:   315379:
 fb6083d790438c373c085d8febe73b48929c6190 v: v3

---
 [refs]                         | 2 +-
 trunk/net/ieee802154/6lowpan.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f7d594835ee2..44d0d1c2d32a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e5928f6dfd92a47c489bb735c4cb8bbb62038e0
+refs/heads/master: d4787a15432384826a0bed42d189fc2a97dc73ea
diff --git a/trunk/net/ieee802154/6lowpan.c b/trunk/net/ieee802154/6lowpan.c
index 6871ec1b30f8..416a54d31fb2 100644
--- a/trunk/net/ieee802154/6lowpan.c
+++ b/trunk/net/ieee802154/6lowpan.c
@@ -314,6 +314,9 @@ lowpan_uncompress_udp_header(struct sk_buff *skb)
 	struct udphdr *uh = udp_hdr(skb);
 	u8 tmp;
 
+	if (!uh)
+		goto err;
+
 	if (lowpan_fetch_skb_u8(skb, &tmp))
 		goto err;