2016-12-04 05:10:50

by Pan Bian

Subject: [PATCH 1/1] input: usbhid: fix improper check

From: Pan Bian <[email protected]>

Function hid_post_reset() returns 0 on success, or 1 on failures.
However, in function hid_reset_resume(), uses "status >= 0" to check the
return value of hid_post_reset(). Obviously, the condition will always
be satisfied. This patch fixes the bug, uses "status == 0" to check the
return value.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188921

Signed-off-by: Pan Bian <[email protected]>
---
drivers/hid/usbhid/hid-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index ae83af6..3639b70 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1590,7 +1590,7 @@ static int hid_reset_resume(struct usb_interface *intf)
int status;

status = hid_post_reset(intf);
- if (status >= 0 && hid->driver && hid->driver->reset_resume) {
+ if (status == 0 && hid->driver && hid->driver->reset_resume) {
int ret = hid->driver->reset_resume(hid);
if (ret < 0)
status = ret;
--
1.9.1

2016-12-05 09:14:10

by Oliver Neukum

Subject: Re: [PATCH 1/1] input: usbhid: fix improper check

On Sun, 2016-12-04 at 13:10 +0800, Pan Bian wrote:
> From: Pan Bian <[email protected]>
>
> Function hid_post_reset() returns 0 on success, or 1 on failures.

It seems like hid_post_reset() is buggy in not returning
a proper error code in the failure case. So your diagnosis
is right, but the fix is at the wrong place.

Regards
Oliver