diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 18:42:23 -0800 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2011-04-30 16:53:35 +0200 |
| commit | c284f760b129a09691c76f24e25566dae1250b62 (patch) | |
| tree | 8bf850783cf05e72173c8a1a7fad96490ffe9fd8 | |
| parent | 3b8cc900cd3cdb7c2107e276a1709c92b77319db (diff) | |
| download | linux-c284f760b129a09691c76f24e25566dae1250b62.tar.gz linux-c284f760b129a09691c76f24e25566dae1250b62.tar.bz2 linux-c284f760b129a09691c76f24e25566dae1250b62.zip | |
econet: Fix crash in aun_incoming().
commit 4e085e76cbe558b79b54cbab772f61185879bc64 upstream.
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>
Cc: Moritz Muehlenhoff <jmm@debian.org>
[jmm: Slightly adapted for 2.6.32]
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 dc11c44467ee..3b863a35a794 100644 --- a/net/econet/af_econet.c +++ b/net/econet/af_econet.c @@ -845,9 +845,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; + struct ec_device *edev = NULL; struct sock *sk; struct sk_buff *newskb; - struct ec_device *edev = skb->dev->ec_ptr; + + if (dst) + edev = dst->dev->ec_ptr; if (! edev) goto bad; |