From a2c5a8b84b2c8c6a7cb610b26339506eafca5dac Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Fri, 17 Aug 2012 10:33:12 +0000
Subject: [PATCH] --- yaml --- r: 322043 b: refs/heads/master c:
 d92c7f8aabae913de16eb855b19cd2002c341896 h: refs/heads/master i:   322041:
 5b81a0a7e474e16dcb2d625c96b69159f0dcf60b   322039:
 71fb3df9f98ac50d22735927813b5075aae3ee6d v: v3

---
 [refs]                    | 2 +-
 trunk/net/caif/chnl_net.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

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: