Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e085e76 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarNelson Elhage <nelhage@ksplice.com>
Tested-by: default avatarNelson Elhage <nelhage@ksplice.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f1987257

net/econet/af_econet.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -851,9 +851,13 @@ static void aun_incoming(struct sk_buff *skb, struct aunhdr *ah, size_t len) 
{

{

	struct iphdr *ip = ip_hdr(skb);

	struct iphdr *ip = ip_hdr(skb);

	unsigned char stn = ntohl(ip->saddr) & 0xff;

	unsigned char stn = ntohl(ip->saddr) & 0xff;

	struct dst_entry *dst = skb_dst(skb);

	struct ec_device *edev = NULL;

	struct sock *sk = NULL;

	struct sock *sk = NULL;

	struct sk_buff *newskb;

	struct sk_buff *newskb;

	struct ec_device *edev = skb->dev->ec_ptr;



	if (dst)

		edev = dst->dev->ec_ptr;





	if (! edev)

	if (! edev)

		goto bad;

		goto bad;