The patch titled
zd1201: avoid null ptr access of skb->dev
has been added to the -mm tree. Its filename is
zd1201-avoid-null-ptr-access-of-skb-dev.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: zd1201: avoid null ptr access of skb->dev
From: "John W. Linville" <linville@xxxxxxxxxxxxx>
skb->dev is not set until eth_type_trans is called...
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/zd1201.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/net/wireless/zd1201.c~zd1201-avoid-null-ptr-access-of-skb-dev drivers/net/wireless/zd1201.c
--- a/drivers/net/wireless/zd1201.c~zd1201-avoid-null-ptr-access-of-skb-dev
+++ a/drivers/net/wireless/zd1201.c
@@ -327,8 +327,8 @@ static void zd1201_usbrx(struct urb *urb
memcpy(skb_put(skb, 6), &data[datalen-8], 6);
memcpy(skb_put(skb, 2), &data[datalen-24], 2);
memcpy(skb_put(skb, len), data, len);
- skb->dev->last_rx = jiffies;
skb->protocol = eth_type_trans(skb, zd->dev);
+ skb->dev->last_rx = jiffies;
zd->stats.rx_packets++;
zd->stats.rx_bytes += skb->len;
netif_rx(skb);
@@ -384,8 +384,8 @@ static void zd1201_usbrx(struct urb *urb
memcpy(skb_put(skb, 2), &data[6], 2);
memcpy(skb_put(skb, len), data+8, len);
}
- skb->dev->last_rx = jiffies;
skb->protocol = eth_type_trans(skb, zd->dev);
+ skb->dev->last_rx = jiffies;
zd->stats.rx_packets++;
zd->stats.rx_bytes += skb->len;
netif_rx(skb);
_
Patches currently in -mm which might be from linville@xxxxxxxxxxxxx are
origin.patch
zd1201-avoid-null-ptr-access-of-skb-dev.patch
git-wireless.patch
drivers-net-wireless-b43-mainc-fix-an-uninitialized.patch
pm-qos-infrastructure-and-interface.patch
latencyc-use-qos-infrastructure.patch
define-global-bit-macro.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
