From: Alexey Khoroshilov <khoroshilov@ispras.ru>
Date: Fri, 7 Mar 2014 21:11:49 +0000 (+0400)
Subject: p54usb: fix leaks at failure path in p54u_probe()
X-Git-Tag: firefly_0821_release~176^2~4167^2~18^2^2~132
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f5335e00f30ef69f093e5074ecf8ef5e778baf3b;p=firefly-linux-kernel-4.4.55.git

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>
---

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;
 }