niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

HID: elan: Fix memleak in elan_input_configured

Browse source 
When input_mt_init_slots() fails, input should be freed
to prevent memleak. When input_register_device() fails,
we should call input_mt_destroy_slots() to free memory
allocated by input_mt_init_slots().

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Dinghao Liu 2020-08-31 17:06:43 +08:00 • committed by Jiri Kosina
parent 724a419ea2
commit b7429ea53d
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/hid/hid-elan.c
View file

@ -188,6 +188,7 @@ static int elan_input_configured(struct hid_device *hdev, struct hid_input *hi)
ret = input_mt_init_slots(input, ELAN_MAX_FINGERS, INPUT_MT_POINTER); ret = input_mt_init_slots(input, ELAN_MAX_FINGERS, INPUT_MT_POINTER);
if (ret) { if (ret) {
hid_err(hdev, "Failed to init elan MT slots: %d\n", ret); hid_err(hdev, "Failed to init elan MT slots: %d\n", ret);
input_free_device(input);
return ret; return ret;
} }
@ -198,6 +199,7 @@ static int elan_input_configured(struct hid_device *hdev, struct hid_input *hi)
if (ret) { if (ret) {
hid_err(hdev, "Failed to register elan input device: %d\n", hid_err(hdev, "Failed to register elan input device: %d\n",
ret); ret);
input_mt_destroy_slots(input);
input_free_device(input); input_free_device(input);
return ret; return ret;
} }