* [PATCH] staging: usbip: fix memory leak
@ 2010-07-12 14:48 Kulikov Vasiliy
0 siblings, 0 replies; 2+ messages in thread
From: Kulikov Vasiliy @ 2010-07-12 14:48 UTC (permalink / raw)
To: kernel-janitors
Cc: Greg Kroah-Hartman, Tejun Heo, Brian G. Merrell, devel,
linux-kernel
sdev should be freed if stub_add_files() failed.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
drivers/staging/usbip/stub_dev.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c
index 3f95605..1f40851 100644
--- a/drivers/staging/usbip/stub_dev.c
+++ b/drivers/staging/usbip/stub_dev.c
@@ -438,6 +438,8 @@ static int stub_probe(struct usb_interface *interface,
if (err) {
dev_err(&interface->dev, "create sysfs files for %s\n",
udev_busid);
+ usb_set_intfdata(interface, 0);
+ stub_device_free(sdev);
return err;
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] staging: usbip: fix memory leak
@ 2010-08-11 8:02 Kulikov Vasiliy
0 siblings, 0 replies; 2+ messages in thread
From: Kulikov Vasiliy @ 2010-08-11 8:02 UTC (permalink / raw)
To: kernel-janitors
Cc: Greg Kroah-Hartman, Kulikov Vasiliy, Endre Kollar, Tejun Heo,
Brian G. Merrell, devel, linux-kernel
If stub_probe() failed then do not increase interf_count. In original
code sdev was leaked as its interf_count never reaches 0.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
drivers/staging/usbip/stub_dev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c
index b6b753a..b186b5f 100644
--- a/drivers/staging/usbip/stub_dev.c
+++ b/drivers/staging/usbip/stub_dev.c
@@ -427,11 +427,11 @@ static int stub_probe(struct usb_interface *interface,
if (busid_priv->status == STUB_BUSID_ALLOC) {
- busid_priv->interf_count++;
sdev = busid_priv->sdev;
if (!sdev)
return -ENODEV;
+ busid_priv->interf_count++;
dev_info(&interface->dev,
"USB/IP Stub: register a new interface "
"(bus %u dev %u ifn %u)\n", udev->bus->busnum, udev->devnum,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-11 8:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-12 14:48 [PATCH] staging: usbip: fix memory leak Kulikov Vasiliy
-- strict thread matches above, loose matches on Subject: below --
2010-08-11 8:02 Kulikov Vasiliy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox