]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: release interim response after sending status pending response
authorNamjae Jeon <linkinjeon@kernel.org>
Mon, 18 Dec 2023 15:34:52 +0000 (00:34 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Dec 2023 09:42:00 +0000 (10:42 +0100)
[ Upstream commit 2a3f7857ec742e212d6cee7fbbf7b0e2ae7f5161 ]

Add missing release async id and delete interim response entry after
sending status pending response. This only cause when smb2 lease is enable.

Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ksmbd/ksmbd_work.c
fs/ksmbd/oplock.c

index 2510b9f3c8c14a750ba6a29fe5e405f051dd1b66..d7c676c151e209e89cb29b68eb9d14e7e3b9d70c 100644 (file)
@@ -56,6 +56,9 @@ void ksmbd_free_work_struct(struct ksmbd_work *work)
        kfree(work->tr_buf);
        kvfree(work->request_buf);
        kfree(work->iov);
+       if (!list_empty(&work->interim_entry))
+               list_del(&work->interim_entry);
+
        if (work->async_id)
                ksmbd_release_id(&work->conn->async_ida, work->async_id);
        kmem_cache_free(work_cache, work);
index 13185c74b912fcb5e5abef1a40208e5e0688b3f2..1cf2d2a3746a320e206e40d2d6a3250a7b81c55c 100644 (file)
@@ -833,7 +833,8 @@ static int smb2_lease_break_noti(struct oplock_info *opinfo)
                                             interim_entry);
                        setup_async_work(in_work, NULL, NULL);
                        smb2_send_interim_resp(in_work, STATUS_PENDING);
-                       list_del(&in_work->interim_entry);
+                       list_del_init(&in_work->interim_entry);
+                       release_async_work(in_work);
                }
                INIT_WORK(&work->work, __smb2_lease_break_noti);
                ksmbd_queue_work(work);