From: Patrick McHardy <kaber@trash.net>
Date: Thu, 18 Oct 2007 12:09:28 +0000 (-0700)
Subject: [NET]: Fix OOPS due to missing check in dev_parse_header().
X-Git-Tag: v2.6.24-rc1~294^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b83336bb9fa4f110b5b0a4378a82cd5f0fd0ac8;p=linux-2.6

[NET]: Fix OOPS due to missing check in dev_parse_header().

[ This is kernel bugzilla 9174 "linux-2.6.23-git11 kernel panic" ]

The device in question is an IPv6-over-IPv4 tunnel, which doesn't have
any header_ops, so the crash happens in dev_parse_header when
dereferencing them.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 39dd83b183..452c88d971 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -827,7 +827,7 @@ static inline int dev_parse_header(const struct sk_buff *skb,
 {
 	const struct net_device *dev = skb->dev;
 
-	if (!dev->header_ops->parse)
+	if (!dev->header_ops || !dev->header_ops->parse)
 		return 0;
 	return dev->header_ops->parse(skb, haddr);
 }