From: Namjae Jeon <linkinjeon@kernel.org>
Date: Mon, 18 Dec 2023 15:34:54 +0000 (+0900)
Subject: ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error
X-Git-Tag: v5.15.145~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=811b5eaee70e24a94c94d8f10b7238eb570369eb;p=thirdparty%2Fkernel%2Fstable.git

ksmbd: don't update ->op_state as OPLOCK_STATE_NONE on error

[ Upstream commit cd80ce7e68f1624ac29cd0a6b057789d1236641e ]

ksmbd set ->op_state as OPLOCK_STATE_NONE on lease break ack error.
op_state of lease should not be updated because client can send lease
break ack again. This patch fix smb2.lease.breaking2 test failure.

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>
---

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index fd174b469bcbd..7ce5746f91674 100644
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -8237,7 +8237,6 @@ static void smb21_lease_break_ack(struct ksmbd_work *work)
 		return;
 
 err_out:
-	opinfo->op_state = OPLOCK_STATE_NONE;
 	wake_up_interruptible_all(&opinfo->oplock_q);
 	atomic_dec(&opinfo->breaking_cnt);
 	wake_up_interruptible_all(&opinfo->oplock_brk);