]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
HID: alps: fix error return code in alps_input_configured()
authorJia-Ju Bai <baijiaju1990@gmail.com>
Thu, 4 Mar 2021 13:19:57 +0000 (05:19 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Apr 2021 10:07:16 +0000 (12:07 +0200)
[ Upstream commit fa8ba6e5dc0e78e409e503ddcfceef5dd96527f4 ]

When input_register_device() fails, no error return code is assigned.
To fix this bug, ret is assigned with -ENOENT as error return code.

Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/hid/hid-alps.c

index ed9c0ea5b026efa698462bc389307bd16427f98c..1bc6ad0339d227c9c63b9df9303484228030fcdd 100644 (file)
@@ -429,6 +429,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
                ret = input_register_device(data->input2);
                if (ret) {
                        input_free_device(input2);
+                       ret = -ENOENT;
                        goto exit;
                }
        }