All of lore.kernel.org
 help / color / mirror / Atom feed
From: Namjae Jeon <linkinjeon@kernel.org>
To: sashal@kernel.org, gregkh@linuxfoundation.org, stable@vger.kernel.org
Cc: smfrench@gmail.com, Namjae Jeon <linkinjeon@kernel.org>,
	Steve French <stfrench@microsoft.com>
Subject: [PATCH v2 5.15.y 7/8] ksmbd: avoid duplicate opinfo_put() call on error of smb21_lease_break_ack()
Date: Wed, 27 Dec 2023 19:26:04 +0900	[thread overview]
Message-ID: <20231227102605.4766-8-linkinjeon@kernel.org> (raw)
In-Reply-To: <20231227102605.4766-1-linkinjeon@kernel.org>

[ 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>
---
 fs/ksmbd/smb2pdu.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index c1dde4204366..e1c640ed7acc 100644
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -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;
-- 
2.25.1


  parent reply	other threads:[~2023-12-27 10:26 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-27 10:25 [PATCH v2 5.15.y 0/8] Additional ksmbd backport patches for linux-5.15.y Namjae Jeon
2023-12-27 10:25 ` [PATCH v2 5.15.y 1/8] ksmbd: have a dependency on cifs ARC4 Namjae Jeon
2023-12-27 10:25 ` [PATCH v2 5.15.y 2/8] ksmbd: set epoch in create context v2 lease Namjae Jeon
2023-12-27 10:26 ` [PATCH v2 5.15.y 3/8] ksmbd: set v2 lease capability Namjae Jeon
2023-12-27 10:26 ` [PATCH v2 5.15.y 4/8] ksmbd: downgrade RWH lease caching state to RH for directory Namjae Jeon
2023-12-27 10:26 ` [PATCH v2 5.15.y 5/8] ksmbd: send v2 lease break notification " Namjae Jeon
2023-12-27 10:26 ` [PATCH v2 5.15.y 6/8] ksmbd: lazy v2 lease break on smb2_write() Namjae Jeon
2023-12-27 10:26 ` Namjae Jeon [this message]
2023-12-27 10:26 ` [PATCH v2 5.15.y 8/8] ksmbd: fix wrong allocation size update in smb2_open() Namjae Jeon
2023-12-30 11:04 ` [PATCH v2 5.15.y 0/8] Additional ksmbd backport patches for linux-5.15.y Greg KH
2023-12-30 13:53   ` Namjae Jeon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231227102605.4766-8-linkinjeon@kernel.org \
    --to=linkinjeon@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=sashal@kernel.org \
    --cc=smfrench@gmail.com \
    --cc=stable@vger.kernel.org \
    --cc=stfrench@microsoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.