Skip to content

Commit

Permalink
Staging: vt6656: problems in error handling
Browse files Browse the repository at this point in the history
The first kfree(pDevice) is pointless because pDevice is NULL.  The
second kfree(pDevice) is a double free because pDevice is the driver's
private data and that is already freed by free_netdev(netdev).  Also the
free_netdev() error path doesn't call usb_put_dev().

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Aug 31, 2010
1 parent fe14978 commit e3a92cd
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/staging/vt6656/main_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -770,10 +770,9 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)

udev = usb_get_dev(udev);
netdev = alloc_etherdev(sizeof(DEVICE_INFO));

if (!netdev) {
printk(KERN_ERR DEVICE_NAME ": allocate net device failed\n");
kfree(pDevice);
rc = -ENOMEM;
goto err_nomem;
}

Expand All @@ -799,9 +798,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
rc = register_netdev(netdev);
if (rc) {
printk(KERN_ERR DEVICE_NAME " Failed to register netdev\n");
free_netdev(netdev);
kfree(pDevice);
return -ENODEV;
goto err_netdev;
}

usb_device_reset(pDevice);
Expand All @@ -819,10 +816,12 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)

return 0;

err_netdev:
free_netdev(netdev);
err_nomem:
usb_put_dev(udev);

return -ENOMEM;
return rc;
}

static void device_free_tx_bufs(PSDevice pDevice)
Expand Down

0 comments on commit e3a92cd

Please sign in to comment.