diff --git a/[refs] b/[refs] index e156310b8f6e..6bfec831e503 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c71bec66ae65305ba5c33c93aa722f21f092737 +refs/heads/master: d92c7f8aabae913de16eb855b19cd2002c341896 diff --git a/trunk/net/caif/chnl_net.c b/trunk/net/caif/chnl_net.c index 69771c04ba8f..e597733affb8 100644 --- a/trunk/net/caif/chnl_net.c +++ b/trunk/net/caif/chnl_net.c @@ -94,6 +94,10 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt) /* check the version of IP */ ip_version = skb_header_pointer(skb, 0, 1, &buf); + if (!ip_version) { + kfree_skb(skb); + return -EINVAL; + } switch (*ip_version >> 4) { case 4: