Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3a92cde authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

Staging: vt6656: problems in error handling



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: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fe149785
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -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;
	}

@@ -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);
@@ -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)