diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-08 21:42:23 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-08 23:51:15 -0500 |
commit | 4e085e76cbe558b79b54cbab772f61185879bc64 (patch) | |
tree | d70aa6d1045a2759bfc67b4eafbb0199f5877b1c | |
parent | f19872575ff7819a3723154657a497d9bca66b33 (diff) |
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>
-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) | |||
851 | { | 851 | { |
852 | struct iphdr *ip = ip_hdr(skb); | 852 | struct iphdr *ip = ip_hdr(skb); |
853 | unsigned char stn = ntohl(ip->saddr) & 0xff; | 853 | unsigned char stn = ntohl(ip->saddr) & 0xff; |
854 | struct dst_entry *dst = skb_dst(skb); | ||
855 | struct ec_device *edev = NULL; | ||
854 | struct sock *sk = NULL; | 856 | struct sock *sk = NULL; |
855 | struct sk_buff *newskb; | 857 | struct sk_buff *newskb; |
856 | struct ec_device *edev = skb->dev->ec_ptr; | 858 | |
859 | if (dst) | ||
860 | edev = dst->dev->ec_ptr; | ||
857 | 861 | ||
858 | if (! edev) | 862 | if (! edev) |
859 | goto bad; | 863 | goto bad; |