lan78xx: Fix memory allocation bug

Fix memory allocation that fails to check for NULL return.

Signed-off-by: John Efstathiades <john.efstathiades@pebblebay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index f20376c1ef3fb1f3cc924a7e06a52801aac7696a..3ddacc6239a3c60ba2e0239e1e66e0f1e7eab88c 100644 (file)
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -4106,18 +4106,20 @@ static int lan78xx_probe(struct usb_interface *intf,
        period = ep_intr->desc.bInterval;
        maxp = usb_maxpacket(dev->udev, dev->pipe_intr, 0);
        buf = kmalloc(maxp, GFP_KERNEL);
-       if (buf) {
-               dev->urb_intr = usb_alloc_urb(0, GFP_KERNEL);
-               if (!dev->urb_intr) {
-                       ret = -ENOMEM;
-                       kfree(buf);
-                       goto out3;
-               } else {
-                       usb_fill_int_urb(dev->urb_intr, dev->udev,
-                                        dev->pipe_intr, buf, maxp,
-                                        intr_complete, dev, period);
-                       dev->urb_intr->transfer_flags |= URB_FREE_BUFFER;
-               }
+       if (!buf) {
+               ret = -ENOMEM;
+               goto out3;
+       }
+
+       dev->urb_intr = usb_alloc_urb(0, GFP_KERNEL);
+       if (!dev->urb_intr) {
+               ret = -ENOMEM;
+               goto out4;
+       } else {
+               usb_fill_int_urb(dev->urb_intr, dev->udev,
+                                dev->pipe_intr, buf, maxp,
+                                intr_complete, dev, period);
+               dev->urb_intr->transfer_flags |= URB_FREE_BUFFER;
        }
 
        dev->maxpacket = usb_maxpacket(dev->udev, dev->pipe_out, 1);
@@ -4125,7 +4127,7 @@ static int lan78xx_probe(struct usb_interface *intf,
        /* Reject broken descriptors. */
        if (dev->maxpacket == 0) {
                ret = -ENODEV;
-               goto out4;
+               goto out5;
        }
 
        /* driver requires remote-wakeup capability during autosuspend. */
@@ -4133,12 +4135,12 @@ static int lan78xx_probe(struct usb_interface *intf,
 
        ret = lan78xx_phy_init(dev);
        if (ret < 0)
-               goto out4;
+               goto out5;
 
        ret = register_netdev(netdev);
        if (ret != 0) {
                netif_err(dev, probe, netdev, "couldn't register the device\n");
-               goto out5;
+               goto out6;
        }
 
        usb_set_intfdata(intf, dev);
@@ -4153,10 +4155,12 @@ static int lan78xx_probe(struct usb_interface *intf,
 
        return 0;
 
-out5:
+out6:
        phy_disconnect(netdev->phydev);
-out4:
+out5:
        usb_free_urb(dev->urb_intr);
+out4:
+       kfree(buf);
 out3:
        lan78xx_unbind(dev, intf);
 out2: