lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

HID: logitech: check the return value of create_singlethread_workqueue

Browse Source 
create_singlethread_workqueue may fail and return NULL. The fix checks if it is
NULL to avoid NULL pointer dereference.  Also, the fix moves the call of
create_singlethread_workqueue earlier to avoid resource-release issues.

Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Kangjie Lu 2019-03-14 00:24:02 -05:00 committed by Jiri Kosina
parent 94a9992f7d
commit 6c44b15e1c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/hid/hid-logitech-hidpp.c
View File

@ -2111,6 +2111,13 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index)
kfree(data); kfree(data);
return -ENOMEM; return -ENOMEM;
} }
data->wq = create_singlethread_workqueue("hidpp-ff-sendqueue");
if (!data->wq) {
kfree(data->effect_ids);
kfree(data);
return -ENOMEM;
}
data->hidpp = hidpp; data->hidpp = hidpp;
data->feature_index = feature_index; data->feature_index = feature_index;
data->version = version; data->version = version;
@ -2155,7 +2162,6 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index)
/* ignore boost value at response.fap.params[2] */ /* ignore boost value at response.fap.params[2] */
/* init the hardware command queue */ /* init the hardware command queue */
data->wq = create_singlethread_workqueue("hidpp-ff-sendqueue");
atomic_set(&data->workqueue_size, 0); atomic_set(&data->workqueue_size, 0);
/* initialize with zero autocenter to get wheel in usable state */ /* initialize with zero autocenter to get wheel in usable state */