Skip to content

Commit

Permalink
net: fix NULL-deref in WARN() in skb_gso_segment()
Browse files Browse the repository at this point in the history
Bug was introduced in commit c8f44af.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Michał Mirosław authored and David S. Miller committed Jan 17, 2012
1 parent 36c9247 commit 65e9d2f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1889,6 +1889,7 @@ EXPORT_SYMBOL(skb_set_dev);

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 = "";

Expand All @@ -1897,8 +1898,8 @@ static void skb_warn_bad_offload(const struct sk_buff *skb)

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);
}
Expand Down

0 comments on commit 65e9d2f

Please sign in to comment.