Commit 6c15d74d authored Jan 07, 2012 by Aurelien Jacobs Committed by David S. Miller Jan 07, 2012

asix: fix infinite loop in rx_fixup()



At this point if skb->len happens to be 2, the subsequant skb_pull(skb, 4)
call won't work and the skb->len won't be decreased and won't ever reach 0,
resulting in an infinite loop.

With an ASIX 88772 under heavy load, without this patch, rx_fixup() reaches
an infinite loop in less than a minute. With this patch applied,
no infinite loop even after hours of heavy load.

Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6d62a66e

drivers/net/usb/asix.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -376,7 +376,7 @@ static int asix_rx_fixup(struct usbnet dev, struct sk_buff skb)

		skb_pull(skb, (size + 1) & 0xfffe);

		if (skb->len == 0)
		if (skb->len < sizeof(header))
		break;

		head = (u8 *) skb->data;