diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 18:42:23 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 20:51:15 -0800 |
| commit | 4e085e76cbe558b79b54cbab772f61185879bc64 (patch) | |
| tree | d70aa6d1045a2759bfc67b4eafbb0199f5877b1c /net/econet | |
| parent | f19872575ff7819a3723154657a497d9bca66b33 (diff) | |
| download | linux-4e085e76cbe558b79b54cbab772f61185879bc64.tar.gz linux-4e085e76cbe558b79b54cbab772f61185879bc64.tar.bz2 linux-4e085e76cbe558b79b54cbab772f61185879bc64.zip | |
econet: Fix crash in aun_incoming().
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>
Diffstat (limited to 'net/econet')
| -rw-r--r-- | net/econet/af_econet.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c index f180371fa415..15dcc1a586b4 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c @@ -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; |