diff options
| author | Alexey Khoroshilov | 2014-03-07 22:11:49 +0100 |
|---|---|---|
| committer | John W. Linville | 2014-03-14 19:49:13 +0100 |
| commit | f5335e00f30ef69f093e5074ecf8ef5e778baf3b (patch) | |
| tree | 7bb578c09a10eb5865d983d1829e3a014eaf7b08 | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff) | |
| download | kernel-qcow2-linux-f5335e00f30ef69f093e5074ecf8ef5e778baf3b.tar.gz kernel-qcow2-linux-f5335e00f30ef69f093e5074ecf8ef5e778baf3b.tar.xz kernel-qcow2-linux-f5335e00f30ef69f093e5074ecf8ef5e778baf3b.zip | |
p54usb: fix leaks at failure path in p54u_probe()
If p54u_load_firmware() fails, p54u_probe() does not deallocate
already allocated resources. The patch adds proper failure handling.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index b7ab3dfb3de8..043bd1c23c19 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -1053,6 +1053,10 @@ static int p54u_probe(struct usb_interface *intf, priv->upload_fw = p54u_upload_firmware_net2280; } err = p54u_load_firmware(dev, intf); + if (err) { + usb_put_dev(udev); + p54_free_common(dev); + } return err; } |