diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2013-09-11 21:56:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-01 09:17:46 -0700 |
| commit | 30c1e32f6fb5b48d6fd1625858c25b38af9ee91f (patch) | |
| tree | 72756f15d958d6c32feaa714e8032affce4315d1 /drivers/hid | |
| parent | be3cdbf50f4f72325d145318d6ce02acad478925 (diff) | |
| download | linux-3.10-30c1e32f6fb5b48d6fd1625858c25b38af9ee91f.tar.gz linux-3.10-30c1e32f6fb5b48d6fd1625858c25b38af9ee91f.tar.bz2 linux-3.10-30c1e32f6fb5b48d6fd1625858c25b38af9ee91f.zip | |
HID: lenovo-tpkbd: fix leak if tpkbd_probe_tp fails
commit 0ccdd9e7476680c16113131264ad6597bd10299d upstream.
If tpkbd_probe_tp() bails out, the probe() function return an error,
but hid_hw_stop() is never called.
fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=1003998
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-lenovo-tpkbd.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/hid/hid-lenovo-tpkbd.c b/drivers/hid/hid-lenovo-tpkbd.c index 07837f5a4eb..0557e8095c6 100644 --- a/drivers/hid/hid-lenovo-tpkbd.c +++ b/drivers/hid/hid-lenovo-tpkbd.c @@ -406,22 +406,27 @@ static int tpkbd_probe(struct hid_device *hdev, ret = hid_parse(hdev); if (ret) { hid_err(hdev, "hid_parse failed\n"); - goto err_free; + goto err; } ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT); if (ret) { hid_err(hdev, "hid_hw_start failed\n"); - goto err_free; + goto err; } uhdev = (struct usbhid_device *) hdev->driver_data; - if (uhdev->ifnum == 1) - return tpkbd_probe_tp(hdev); + if (uhdev->ifnum == 1) { + ret = tpkbd_probe_tp(hdev); + if (ret) + goto err_hid; + } return 0; -err_free: +err_hid: + hid_hw_stop(hdev); +err: return ret; } |