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;