Re: [PATCH] net: fix NULL-deref in WARN() in skb_gso_segment()

[Ben Hutchings <bhutchings@solarflare.com>]

On Tue, 2012-01-17 at 21:00 +0100, Michał Mirosław wrote:
> Bug was introduced in commit c8f44affb7244f2ac3e703cab13d55ede27621bb.

Sorry, this conflicts with changes I've just submitted, the first of
which has already been applied.

Ben.

> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> ---
>  net/core/dev.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> [against net tree]
> 
> diff --git a/net/core/dev.c b/net/core/dev.c
> index f494675..634a70a 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -1961,6 +1961,7 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb,
>  	__skb_pull(skb, skb->mac_len);
>  
>  	if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) {
> +		static const netdev_features_t null_features = 0;
>  		struct net_device *dev = skb->dev;
>  		struct ethtool_drvinfo info = {};
>  
> @@ -1968,8 +1969,8 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb,
>  			dev->ethtool_ops->get_drvinfo(dev, &info);
>  
>  		WARN(1, "%s: caps=(%pNF, %pNF) len=%d data_len=%d ip_summed=%d\n",
> -		     info.driver, dev ? &dev->features : NULL,
> -		     skb->sk ? &skb->sk->sk_route_caps : NULL,
> +		     info.driver, dev ? &dev->features : &null_features,
> +		     skb->sk ? &skb->sk->sk_route_caps : &null_features,
>  		     skb->len, skb->data_len, skb->ip_summed);
>  
>  		if (skb_header_cloned(skb) &&

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.