econet: Fix crash in aun_incoming().
authorDavid S. Miller <davem@davemloft.net>
Thu, 9 Dec 2010 02:42:23 +0000 (18:42 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Dec 2010 04:51:15 +0000 (20:51 -0800)
Unconditional use of skb->dev won't work here,
try to fetch the econet device via skb_dst()->dev
instead.

Suggested by Eric Dumazet.

Reported-by: Nelson Elhage <nelhage@ksplice.com>
Tested-by: Nelson Elhage <nelhage@ksplice.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/econet/af_econet.c

index f180371fa415de9f17a7911e391a272eb09b55ac..15dcc1a586b4a312ee877e78b4e72f1a5e9631e2 100644 (file)
@@ -851,9 +851,13 @@ static void aun_incoming(struct sk_buff *skb, struct aunhdr *ah, size_t len)
 {
        struct iphdr *ip = ip_hdr(skb);
        unsigned char stn = ntohl(ip->saddr) & 0xff;
+       struct dst_entry *dst = skb_dst(skb);
+       struct ec_device *edev = NULL;
        struct sock *sk = NULL;
        struct sk_buff *newskb;
-       struct ec_device *edev = skb->dev->ec_ptr;
+
+       if (dst)
+               edev = dst->dev->ec_ptr;
 
        if (! edev)
                goto bad;