Skip to content

Commit

Permalink
net: usb: asix: Fix crash on skb alloc failure
Browse files Browse the repository at this point in the history
If asix_rx_fixup_internal() fails to allocate rx->ax_skb, it will return
but not clear rx->size. rx points to driver private data. A later call
assumes that nonzero size means ax_skb was allocated and passes a null
ax_skb to skb_put. Changed allocation failure return to clear size first.

Found testing board with AX88772B devices.

Signed-off-by: David B. Robins <linux@davidrobins.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David B. Robins authored and nkskjames committed Jan 13, 2016
1 parent 7221dcb commit bc3d8cf
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/net/usb/asix_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ int asix_rx_fixup_internal(struct usbnet *dev, struct sk_buff *skb,
}
rx->ax_skb = netdev_alloc_skb_ip_align(dev->net,
rx->size);
if (!rx->ax_skb)
if (!rx->ax_skb) {
rx->size = 0;
return 0;
}
}

if (rx->size > dev->net->mtu + ETH_HLEN + VLAN_HLEN) {
Expand Down

0 comments on commit bc3d8cf

Please sign in to comment.