From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF0D2224234; Tue, 8 Apr 2025 11:59:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113546; cv=none; b=phLUXfg+vqsoTNm47jtBvUgiUpoOhVPib4nGQ4aLIfJrSMuc7bFqjnHeSe/W4bIKp0Oou/oRKa0DRXFJnXVa7XNw9iHKjlOERnZJfJnSkVEVLp2sehG+rfUQHMzgTjoCK5v7hTPOqNz/FsILooHCAeCsYQzkR4aAxXK/jjAHEMc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744113546; c=relaxed/simple; bh=tMH1kRxKAzoQLsrENZjzegtLTqIFQGK2mmp5vtIVeRk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZJvr1wDNkPwYmiFBBqLSYbZOCX7QoLEFJoxfCJ3HhQhpblc5lC+bLjdIdOfSTZI9fcfp5YMbfNToOTkR9NTW4Qj+VANIi6JzIisDlQqyAOS6kXCUgzeendfNmQnAryB8SNMHkjWsc39CwRWG4UhgMtslF60b1dJaeCa7lSQjoEA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=i37TqD9s; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="i37TqD9s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20019C4CEE5; Tue, 8 Apr 2025 11:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744113545; bh=tMH1kRxKAzoQLsrENZjzegtLTqIFQGK2mmp5vtIVeRk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i37TqD9s3LgHdOLy8Wli+8uyjfAEAE/Eg68g+NHuL0Z7SgvPMtl/uk/u8drWycaMf YCMryGk0YRsxATRTvCOVKhMU7GMBsFxZqNeYQSshscUxg+3IIsttRNCJkc0WYz2r5q aAuTB308KRV5c4eN5a1059jTmmFrVNb5X0QRSLq0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Norbert Szetei , Namjae Jeon , Steve French , Sasha Levin Subject: [PATCH 6.6 149/268] ksmbd: fix r_count dec/increment mismatch Date: Tue, 8 Apr 2025 12:49:20 +0200 Message-ID: <20250408104832.553120913@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104828.499967190@linuxfoundation.org> References: <20250408104828.499967190@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Namjae Jeon [ Upstream commit ddb7ea36ba7129c2ed107e2186591128618864e1 ] r_count is only increased when there is an oplock break wait, so r_count inc/decrement are not paired. This can cause r_count to become negative, which can lead to a problem where the ksmbd thread does not terminate. Fixes: 3aa660c05924 ("ksmbd: prevent connection release during oplock break notification") Reported-by: Norbert Szetei Tested-by: Norbert Szetei Signed-off-by: Namjae Jeon Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/smb/server/oplock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/smb/server/oplock.c b/fs/smb/server/oplock.c index 11e82a14a40ad..d91493e3d7559 100644 --- a/fs/smb/server/oplock.c +++ b/fs/smb/server/oplock.c @@ -724,8 +724,8 @@ static int smb2_oplock_break_noti(struct oplock_info *opinfo) work->conn = conn; work->sess = opinfo->sess; + ksmbd_conn_r_count_inc(conn); if (opinfo->op_state == OPLOCK_ACK_WAIT) { - ksmbd_conn_r_count_inc(conn); INIT_WORK(&work->work, __smb2_oplock_break_noti); ksmbd_queue_work(work); @@ -833,8 +833,8 @@ static int smb2_lease_break_noti(struct oplock_info *opinfo) work->conn = conn; work->sess = opinfo->sess; + ksmbd_conn_r_count_inc(conn); if (opinfo->op_state == OPLOCK_ACK_WAIT) { - ksmbd_conn_r_count_inc(conn); INIT_WORK(&work->work, __smb2_lease_break_noti); ksmbd_queue_work(work); wait_for_break_ack(opinfo); -- 2.39.5