summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-elan.c
diff options
context:
space:
mode:
authorDinghao Liu <dinghao.liu@zju.edu.cn>2020-08-31 12:06:43 +0300
committerJiri Kosina <jkosina@suse.cz>2020-09-01 10:11:24 +0300
commitb7429ea53d6c0936a0f10a5d64164f0aea440143 (patch)
tree9cfe864249a487a7d27e47da36d3c3e3e0145fa2 /drivers/hid/hid-elan.c
parent724a419ea28f7514a391e80040230f69cf626707 (diff)
downloadlinux-b7429ea53d6c0936a0f10a5d64164f0aea440143.tar.xz
HID: elan: Fix memleak in elan_input_configured
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>
Diffstat (limited to 'drivers/hid/hid-elan.c')
-rw-r--r--drivers/hid/hid-elan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/hid-elan.c b/drivers/hid/hid-elan.c
index 45c4f888b7c4..dae193749d44 100644
--- a/drivers/hid/hid-elan.c
+++ b/drivers/hid/hid-elan.c
@@ -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);
if (ret) {
hid_err(hdev, "Failed to init elan MT slots: %d\n", ret);
+ input_free_device(input);
return ret;
}
@@ -198,6 +199,7 @@ static int elan_input_configured(struct hid_device *hdev, struct hid_input *hi)
if (ret) {
hid_err(hdev, "Failed to register elan input device: %d\n",
ret);
+ input_mt_destroy_slots(input);
input_free_device(input);
return ret;
}