]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ksmbd: avoid duplicate opinfo_put() call on error of smb21_lease_break_ack()
authorNamjae Jeon <linkinjeon@kernel.org>
Wed, 27 Dec 2023 10:26:04 +0000 (19:26 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Jan 2024 14:13:37 +0000 (15:13 +0100)
[ Upstream commit 658609d9a618d8881bf549b5893c0ba8fcff4526 ]

opinfo_put() could be called twice on error of smb21_lease_break_ack().
It will cause UAF issue if opinfo is referenced on other places.

Signed-off-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 c1dde420436629f31449bdedfa473fde2bc6cc72..e1c640ed7acc31452af6ccad5453901f3211a058 100644 (file)
@@ -8221,6 +8221,11 @@ static void smb21_lease_break_ack(struct ksmbd_work *work)
                            le32_to_cpu(req->LeaseState));
        }
 
+       if (ret < 0) {
+               rsp->hdr.Status = err;
+               goto err_out;
+       }
+
        lease_state = lease->state;
        opinfo->op_state = OPLOCK_STATE_NONE;
        wake_up_interruptible_all(&opinfo->oplock_q);
@@ -8228,11 +8233,6 @@ static void smb21_lease_break_ack(struct ksmbd_work *work)
        wake_up_interruptible_all(&opinfo->oplock_brk);
        opinfo_put(opinfo);
 
-       if (ret < 0) {
-               rsp->hdr.Status = err;
-               goto err_out;
-       }
-
        rsp->StructureSize = cpu_to_le16(36);
        rsp->Reserved = 0;
        rsp->Flags = 0;