Re: [patch 00/21] 2.6.19-stable review

Chuck Ebbert
2007-02-21T16:53:30Z

[-- Attachment #1: Type: text/plain, Size: 503 bytes --]

Greg KH wrote:
> This is the start of the stable review cycle for the 2.6.19.5 release.
>
> This will probably be the last release of the 2.6.19-stable series, so
> if there are patches that you feel should be applied to that tree,
> please let me know.
>

The attached fixes an oops in the usbnet driver. The same patch is
in 2.6.21-rc1, but that one has many whitespace changes. This is much
smaller.

From: David Brownell <david-b@pacbell.net>
Signed-off-by: David Brownell <david-b@pacbell.net>

[-- Attachment #2: linux-2.6-usbnet_fix_failure_path_oops.patch --]
[-- Type: text/plain, Size: 967 bytes --]

Index: linux-2.6.20.noarch/drivers/usb/net/usbnet.c
===================================================================
--- linux-2.6.20.noarch.orig/drivers/usb/net/usbnet.c 2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.20.noarch/drivers/usb/net/usbnet.c 2007-02-18 18:57:05.000000000 -0500
@@ -1182,6 +1182,9 @@
// NOTE net->name still not usable ...
if (info->bind) {
status = info->bind (dev, udev);
+ if (status < 0)
+ goto out1;
+
// heuristic: "usb%d" for links we know are two-host,
// else "eth%d" when there's reasonable doubt. userspace
// can rename the link if it knows better.
@@ -1208,12 +1211,12 @@
if (status == 0 && dev->status)
status = init_status (dev, udev);
if (status < 0)
- goto out1;
+ goto out3;

if (!dev->rx_urb_size)
dev->rx_urb_size = dev->hard_mtu;
dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1);
-
+
SET_NETDEV_DEV(net, &udev->dev);
status = register_netdev (net);
if (status)