This is a note to let you know that I've just added the patch titled
econet: Fix crash in aun_incoming().
to the 2.6.33-longterm tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.33.git;a=summary
The filename of the patch is:
econet-fix-crash-in-aun_incoming.patch
and it can be found in the queue-2.6.33 subdirectory.
If you, or anyone else, feels it should not be added to the 2.6.33 longterm
tree,
please let <[email protected]> know about it.
>From 4e085e76cbe558b79b54cbab772f61185879bc64 Mon Sep 17 00:00:00 2001
From: David S. Miller <[email protected]>
Date: Wed, 8 Dec 2010 18:42:23 -0800
Subject: econet: Fix crash in aun_incoming().
From: David S. Miller <[email protected]>
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 <[email protected]>
Tested-by: Nelson Elhage <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Cc: Moritz Muehlenhoff <[email protected]>
[jmm: Slightly adapted for 2.6.32]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/econet/af_econet.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -844,9 +844,13 @@ static void aun_incoming(struct sk_buff
{
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;
Patches currently in longterm-queue-2.6.33 which might be from
[email protected] are
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/gro-reset-dev-pointer-on-reuse.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/econet-4-byte-infoleak-to-the-network.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/net-tipc-fix-information-leak-to-userland.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/inet_diag-make-sure-we-actually-run-the-same-bytecode-we-audited.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/econet-fix-crash-in-aun_incoming.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/net-ax25-fix-information-leak-to-userland.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/rose-prevent-heap-corruption-with-bad-facilities.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/irda-prevent-heap-corruption-on-invalid-nickname.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/myri10ge-fix-rmmod-crash.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/irda-validate-peer-name-and-attribute-lengths.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/gro-reset-skb_iif-on-reuse.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/net-packet-fix-information-leak-to-userland.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/irda-prevent-integer-underflow-in-irlmp_enumdevices.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/atm-solos-pci-don-t-include-frame-pseudo-header-on-transmit-hex-dump.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.33/queue-2.6.33/can-use-inode-instead-of-kernel-address-for-proc-file.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
