]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: fix memory leak in smb2_lock()
authorZizhi Wo <wozizhi@huawei.com>
Fri, 1 Dec 2023 14:50:48 +0000 (22:50 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Dec 2023 14:17:34 +0000 (15:17 +0100)
[ Upstream commit 8f1752723019db900fb60a5b9d0dfd3a2bdea36c ]

In smb2_lock(), if setup_async_work() executes successfully,
work->cancel_argv will bind the argv that generated by kmalloc(). And
release_async_work() is called in ksmbd_conn_try_dequeue_request() or
smb2_lock() to release argv.
However, when setup_async_work function fails, work->cancel_argv has not
been bound to the argv, resulting in the previously allocated argv not
being released. Call kfree() to fix it.

Fixes: e2f34481b24d ("cifsd: add server-side procedures for SMB3")
Signed-off-by: Zizhi Wo <wozizhi@huawei.com>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/ksmbd/smb2pdu.c

index 656c627d1bdf7d2aaf2b75ea3fb3c528e8ef049d..a7973b7012e9b52aa1daea3823be7e82fa64e0d3 100644 (file)
@@ -7068,6 +7068,7 @@ skip:
                                                      smb2_remove_blocked_lock,
                                                      argv);
                                if (rc) {
+                                       kfree(argv);
                                        err = -ENOMEM;
                                        goto out;
                                }