mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-10-04 10:50:58 +00:00
[PATCH] zd1201: avoid null ptr access of skb->dev
skb->dev is not set until eth_type_trans is called... Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
4937ce8795
commit
3ba72b2521
1 changed files with 2 additions and 2 deletions
|
@ -327,8 +327,8 @@ static void zd1201_usbrx(struct urb *urb)
|
||||||
memcpy(skb_put(skb, 6), &data[datalen-8], 6);
|
memcpy(skb_put(skb, 6), &data[datalen-8], 6);
|
||||||
memcpy(skb_put(skb, 2), &data[datalen-24], 2);
|
memcpy(skb_put(skb, 2), &data[datalen-24], 2);
|
||||||
memcpy(skb_put(skb, len), data, len);
|
memcpy(skb_put(skb, len), data, len);
|
||||||
skb->dev->last_rx = jiffies;
|
|
||||||
skb->protocol = eth_type_trans(skb, zd->dev);
|
skb->protocol = eth_type_trans(skb, zd->dev);
|
||||||
|
skb->dev->last_rx = jiffies;
|
||||||
zd->stats.rx_packets++;
|
zd->stats.rx_packets++;
|
||||||
zd->stats.rx_bytes += skb->len;
|
zd->stats.rx_bytes += skb->len;
|
||||||
netif_rx(skb);
|
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, 2), &data[6], 2);
|
||||||
memcpy(skb_put(skb, len), data+8, len);
|
memcpy(skb_put(skb, len), data+8, len);
|
||||||
}
|
}
|
||||||
skb->dev->last_rx = jiffies;
|
|
||||||
skb->protocol = eth_type_trans(skb, zd->dev);
|
skb->protocol = eth_type_trans(skb, zd->dev);
|
||||||
|
skb->dev->last_rx = jiffies;
|
||||||
zd->stats.rx_packets++;
|
zd->stats.rx_packets++;
|
||||||
zd->stats.rx_bytes += skb->len;
|
zd->stats.rx_bytes += skb->len;
|
||||||
netif_rx(skb);
|
netif_rx(skb);
|
||||||
|
|
Loading…
Reference in a new issue