commit 65e9d2faab70d07b9a38ac6ed298f191d24541fc
author Michał Mirosław <mirq-linux@rere.qmqm.pl> Tue Jan 17 10:00:40 2012 +0000
committer David S. Miller <davem@davemloft.net> Tue Jan 17 15:51:23 2012 -0500
tree 41bb55a55858d79f142cb37c2f3c3364fc778790
parent 36c92474498ad6cc3afb24b91a67a444d79978fe

net: fix NULL-deref in WARN() in skb_gso_segment()

Bug was introduced in commit c8f44affb7244f2ac3e703cab13d55ede27621bb.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/core/dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 17db2f2..115dee1 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1889,6 +1889,7 @@
 
 static void skb_warn_bad_offload(const struct sk_buff *skb)
 {
+	static const netdev_features_t null_features = 0;
 	struct net_device *dev = skb->dev;
 	const char *driver = "";
 
@@ -1897,8 +1898,8 @@
 
 	WARN(1, "%s: caps=(%pNF, %pNF) len=%d data_len=%d gso_size=%d "
 	     "gso_type=%d ip_summed=%d\n",
-	     driver, dev ? &dev->features : NULL,
-	     skb->sk ? &skb->sk->sk_route_caps : NULL,
+	     driver, dev ? &dev->features : &null_features,
+	     skb->sk ? &skb->sk->sk_route_caps : &null_features,
 	     skb->len, skb->data_len, skb_shinfo(skb)->gso_size,
 	     skb_shinfo(skb)->gso_type, skb->ip_summed);
 }