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 0F9DF27510B; Mon, 5 May 2025 22:14:33 +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=1746483274; cv=none; b=WbgjGLpSk805iGqVmdNCD08tYJoxVVsBVGzzvkUaQDJliAYZj2CTJ+335iDEVF4zWt0W2y0pbFTY1hukNkw+NoIpLkM5DDW8sem5XYFZJjuY5U/pP8Tcnwll0MQkQMGZIbD2l13uojwDC+pROf81Oy5+tlDCocaXG+tJFNCDvkQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746483274; c=relaxed/simple; bh=MW2p40IGj4IEytdS02hDIT4lE068PReq1ZQK6Lm83yg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=XWavoXl1DJRIsgsyYzWGiCtXMs8tJr8jwFBWr3tvAke7hsbes51HWqg+YYeDvrO10lj/OYAWyQMWMsbW57XJ1F+Ury8YTRnauIiEcam4LuHLgffPuZMZkzhgb+2YaaoJ7C8Ge1aer0oO/1BOUlfvaUOxiE220KQ8NHfbNcC76Ms= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GBoE3GnH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GBoE3GnH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9DA05C4CEED; Mon, 5 May 2025 22:14:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746483273; bh=MW2p40IGj4IEytdS02hDIT4lE068PReq1ZQK6Lm83yg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GBoE3GnHSuBWHFiBXpp60w1l0se6en/oobGGB2zF3MNXepZCNXC0AwWEzbBORfSZO /NCKoFrbxJC/bawvEtOPCycNxRiwhQdatOnM8l61bz15UghB9r/joLtcqNv9/+FwDd IkZOjf5V/qeQZ/pss0s4oq4PlbbF1jDKGZYjpmfwSFU6vS0sZ1MTdkCFbNABYLjnLd n6BICYmOM/kVuj0u56X9i7yv0Yr/sMqcjDPnBcjAonjcq+iZ62xn2JLmR2MH8RsxOV TgABnGyWnQocZCYAKjUBkP/0fA3nXV+9CDl2MSnm6bCREU2yzY7HMf7qbYdXEPiunC 2APgN33EScYXA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Pali=20Roh=C3=A1r?= , Steve French , Sasha Levin , sfrench@samba.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org Subject: [PATCH AUTOSEL 6.14 007/642] cifs: Fix negotiate retry functionality Date: Mon, 5 May 2025 18:03:43 -0400 Message-Id: <20250505221419.2672473-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit From: Pali Rohár [ Upstream commit e94e882a6d69525c07589222cf3a6ff57ad12b5b ] SMB negotiate retry functionality in cifs_negotiate() is currently broken and does not work when doing socket reconnect. Caller of this function, which is cifs_negotiate_protocol() requires that tcpStatus after successful execution of negotiate callback stay in CifsInNegotiate. But if the CIFSSMBNegotiate() called from cifs_negotiate() fails due to connection issues then tcpStatus is changed as so repeated CIFSSMBNegotiate() call does not help. Fix this problem by moving retrying code from negotiate callback (which is either cifs_negotiate() or smb2_negotiate()) to cifs_negotiate_protocol() which is caller of those callbacks. This allows to properly handle and implement correct transistions between tcpStatus states as function cifs_negotiate_protocol() already handles it. With this change, cifs_negotiate_protocol() now handles also -EAGAIN error set by the RFC1002_NEGATIVE_SESSION_RESPONSE processing after reconnecting with NetBIOS session. Signed-off-by: Pali Rohár Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/smb/client/connect.c | 10 ++++++++++ fs/smb/client/smb1ops.c | 7 ------- fs/smb/client/smb2ops.c | 3 --- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c index cc9c912db8def..92685fc675b59 100644 --- a/fs/smb/client/connect.c +++ b/fs/smb/client/connect.c @@ -3922,11 +3922,13 @@ int cifs_negotiate_protocol(const unsigned int xid, struct cifs_ses *ses, struct TCP_Server_Info *server) { + bool in_retry = false; int rc = 0; if (!server->ops->need_neg || !server->ops->negotiate) return -ENOSYS; +retry: /* only send once per connect */ spin_lock(&server->srv_lock); if (server->tcpStatus != CifsGood && @@ -3946,6 +3948,14 @@ cifs_negotiate_protocol(const unsigned int xid, struct cifs_ses *ses, spin_unlock(&server->srv_lock); rc = server->ops->negotiate(xid, ses, server); + if (rc == -EAGAIN) { + /* Allow one retry attempt */ + if (!in_retry) { + in_retry = true; + goto retry; + } + rc = -EHOSTDOWN; + } if (rc == 0) { spin_lock(&server->srv_lock); if (server->tcpStatus == CifsInNegotiate) diff --git a/fs/smb/client/smb1ops.c b/fs/smb/client/smb1ops.c index 808970e4a7142..e28cdaca47e12 100644 --- a/fs/smb/client/smb1ops.c +++ b/fs/smb/client/smb1ops.c @@ -426,13 +426,6 @@ cifs_negotiate(const unsigned int xid, { int rc; rc = CIFSSMBNegotiate(xid, ses, server); - if (rc == -EAGAIN) { - /* retry only once on 1st time connection */ - set_credits(server, 1); - rc = CIFSSMBNegotiate(xid, ses, server); - if (rc == -EAGAIN) - rc = -EHOSTDOWN; - } return rc; } diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c index 7aeac8dd9a1d1..6f89e087629fe 100644 --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -464,9 +464,6 @@ smb2_negotiate(const unsigned int xid, server->CurrentMid = 0; spin_unlock(&server->mid_lock); rc = SMB2_negotiate(xid, ses, server); - /* BB we probably don't need to retry with modern servers */ - if (rc == -EAGAIN) - rc = -EHOSTDOWN; return rc; } -- 2.39.5