Commit 1430ee73 authored by Peter Wu's avatar Peter Wu Committed by Jiri Kosina

HID: logitech-hidpp: check name retrieval return code

hidpp_devicenametype_get_device_name() may return a negative value on
protocol errors (for example, when the device is powered off).
Explicitly check this condition to avoid a long-running loop.

(0 cannot be returned as __name_length - index > 0, but check for it
anyway as it would otherwise result in an infinite loop.)
Signed-off-by: default avatarPeter Wu <peter@lekensteyn.nl>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 02cc097e
...@@ -484,10 +484,16 @@ static char *hidpp_get_device_name(struct hidpp_device *hidpp) ...@@ -484,10 +484,16 @@ static char *hidpp_get_device_name(struct hidpp_device *hidpp)
if (!name) if (!name)
return NULL; return NULL;
while (index < __name_length) while (index < __name_length) {
index += hidpp_devicenametype_get_device_name(hidpp, ret = hidpp_devicenametype_get_device_name(hidpp,
feature_index, index, name + index, feature_index, index, name + index,
__name_length - index); __name_length - index);
if (ret <= 0) {
kfree(name);
return NULL;
}
index += ret;
}
return name; return name;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment