mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
staging: wlan-ng: fix leaks on failure paths in prism2sta_probe_usb()
There are leaks of resources allocated by wlan_setup() and usb_dev refcnt on failure paths in prism2sta_probe_usb(). The patch adds appropriate deallocations and removes invalid code from hfa384x_corereset() failure handling. unregister_wlandev() is wrong because it is not registered yet. hfa384x_destroy() is just noop in init state. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
509e42e1d3
commit
b76ed59f75
1 changed files with 6 additions and 4 deletions
|
@ -140,11 +140,9 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
|
||||||
prism2_reset_holdtime,
|
prism2_reset_holdtime,
|
||||||
prism2_reset_settletime, 0);
|
prism2_reset_settletime, 0);
|
||||||
if (result != 0) {
|
if (result != 0) {
|
||||||
unregister_wlandev(wlandev);
|
|
||||||
hfa384x_destroy(hw);
|
|
||||||
result = -EIO;
|
result = -EIO;
|
||||||
dev_err(&interface->dev, "hfa384x_corereset() failed.\n");
|
dev_err(&interface->dev, "hfa384x_corereset() failed.\n");
|
||||||
goto failed;
|
goto failed_reset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -159,11 +157,15 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
|
||||||
if (register_wlandev(wlandev) != 0) {
|
if (register_wlandev(wlandev) != 0) {
|
||||||
dev_err(&interface->dev, "register_wlandev() failed.\n");
|
dev_err(&interface->dev, "register_wlandev() failed.\n");
|
||||||
result = -EIO;
|
result = -EIO;
|
||||||
goto failed;
|
goto failed_register;
|
||||||
}
|
}
|
||||||
|
|
||||||
goto done;
|
goto done;
|
||||||
|
|
||||||
|
failed_register:
|
||||||
|
usb_put_dev(dev);
|
||||||
|
failed_reset:
|
||||||
|
wlan_unsetup(wlandev);
|
||||||
failed:
|
failed:
|
||||||
kfree(wlandev);
|
kfree(wlandev);
|
||||||
kfree(hw);
|
kfree(hw);
|
||||||
|
|
Loading…
Reference in a new issue