Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61effc64 authored by Kangjie Lu's avatar Kangjie Lu Committed by Greg Kroah-Hartman
Browse files

HID: logitech: check the return value of create_singlethread_workqueue 



[ Upstream commit 6c44b15e1c9076d925d5236ddadf1318b0a25ce2 ]

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: default avatarKangjie Lu <kjlu@umn.edu>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent dbfef4bd

drivers/hid/hid-logitech-hidpp.c

+7 −1
Original line number Diff line number Diff line
@@ -1907,6 +1907,13 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index) 
		kfree(data);

		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->feature_index = feature_index;

	data->version = version;
@@ -1951,7 +1958,6 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index) 
	/* ignore boost value at response.fap.params[2] */



	/* init the hardware command queue */

	data->wq = create_singlethread_workqueue("hidpp-ff-sendqueue");

	atomic_set(&data->workqueue_size, 0);



	/* initialize with zero autocenter to get wheel in usable state */