HID: wacom: fix memory leak on kobject creation failure

commit 5ae416c5b1e2e816aee7b3fc8347adf70afabb4c upstream.

During wacom_initialize_remotes() a fifo buffer is allocated
with kfifo_alloc() and later a cleanup action is registered
during devm_add_action_or_reset() to clean it up.

However if the code fails to create a kobject and register it
with sysfs the code simply returns -ENOMEM before the cleanup
action is registered leading to a memory leak.

Fix this by ensuring the fifo is freed when the kobject creation
and registration process fails.

Fixes: 83e6b40e2de6 ("HID: wacom: EKR: have the wacom resources dynamically allocated")
Reviewed-by: Ping Cheng <ping.cheng@wacom.com>
Cc: stable@vger.kernel.org
Signed-off-by: Qasim Ijaz <qasdev00@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 5a72cf8d6944fa890c565ece3e68043837d005db..925298b6f8695ba2a0e1257a1bec55da87ea2313 100644 (file)
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2012,8 +2012,10 @@ static int wacom_initialize_remotes(struct wacom *wacom)
 
        remote->remote_dir = kobject_create_and_add("wacom_remote",
                                                    &wacom->hdev->dev.kobj);
-       if (!remote->remote_dir)
+       if (!remote->remote_dir) {
+               kfifo_free(&remote->remote_fifo);
                return -ENOMEM;
+       }
 
        error = sysfs_create_files(remote->remote_dir, remote_unpair_attrs);