]> err.no Git - linux-2.6/commitdiff
[PATCH] usbnet oops fix
authorlepton <ytht.net@gmail.com>
Tue, 23 Aug 2005 00:06:14 +0000 (17:06 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 Aug 2005 02:59:38 +0000 (19:59 -0700)
There's a "return the wrong SKB" error in the GL620A cable minidriver
(for "usbnet") which can oops.  This would not appear when talking
Linux-to-Linux, only Linux-to-Windows (for recent Linuxes).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/usb/net/usbnet.c

index 576f3b852fce39ccfff151704c1447b883e1703f..4528a00c45b010f8ad6ef103e5eaae6ba8ae83a1 100644 (file)
@@ -1922,7 +1922,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
 
                        // copy the packet data to the new skb
                        memcpy(skb_put(gl_skb, size), packet->packet_data, size);
-                       skb_return (dev, skb);
+                       skb_return (dev, gl_skb);
                }
 
                // advance to the next packet