aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-12-08 18:42:23 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-14 16:53:13 -0700
commitde00d49034d47ceaf4d44b6720b77deb40ca1692 (patch)
treef8fe128ba03431c77370057ce6c47f382d2d198f
parent49600c713e0a46e38a6ac1c560cac5561d464adb (diff)
downloadlinux-linaro-stable-de00d49034d47ceaf4d44b6720b77deb40ca1692.tar.gz
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.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 9ebd08b94f1f..08cf1790004e 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -844,9 +844,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;
struct sk_buff *newskb;
- struct ec_device *edev = skb->dev->ec_ptr;
+
+ if (dst)
+ edev = dst->dev->ec_ptr;
if (! edev)
goto bad;