From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, henrique.carvalho@suse.com
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.1.y] smb: client: Fix match_session bug preventing session reuse
Date: Tue, 18 Mar 2025 11:12:52 -0400 [thread overview]
Message-ID: <20250317204702-eac2b7fc286a666e@stable.kernel.org> (raw)
In-Reply-To: <20250317223037.2785749-1-henrique.carvalho@suse.com>
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 605b249ea96770ac4fac4b8510a99e0f8442be5e
Status in newer kernel trees:
6.13.y | Present (different SHA1: 4a133bda03ec)
6.12.y | Present (different SHA1: 3d48d46299be)
6.6.y | Present (different SHA1: 3fbc1e703fba)
Note: The patch differs from the upstream commit:
---
1: 605b249ea9677 ! 1: d923b67f9a61f smb: client: Fix match_session bug preventing session reuse
@@ Commit message
Reviewed-by: Enzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: Henrique Carvalho <henrique.carvalho@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
+ (cherry picked from commit 605b249ea96770ac4fac4b8510a99e0f8442be5e)
## fs/smb/client/connect.c ##
-@@ fs/smb/client/connect.c: static int match_session(struct cifs_ses *ses,
- struct smb3_fs_context *ctx,
- bool match_super)
+@@ fs/smb/client/connect.c: cifs_get_tcp_session(struct smb3_fs_context *ctx,
+ /* this function must be called with ses_lock and chan_lock held */
+ static int match_session(struct cifs_ses *ses, struct smb3_fs_context *ctx)
{
- if (ctx->sectype != Unspecified &&
- ctx->sectype != ses->sectype)
@@ fs/smb/client/connect.c: static int match_session(struct cifs_ses *ses,
+ struct TCP_Server_Info *server = ses->server;
+ enum securityEnum ctx_sec, ses_sec;
- if (!match_super && ctx->dfs_root_ses != ses->dfs_root_ses)
- return 0;
-@@ fs/smb/client/connect.c: static int match_session(struct cifs_ses *ses,
+ /*
+ * If an existing session is limited to less channels than
+@@ fs/smb/client/connect.c: static int match_session(struct cifs_ses *ses, struct smb3_fs_context *ctx)
if (ses->chan_max < ctx->max_channels)
return 0;
@@ fs/smb/client/connect.c: static int match_session(struct cifs_ses *ses,
+ return 0;
+
+ switch (ctx_sec) {
-+ case IAKerb:
case Kerberos:
if (!uid_eq(ctx->cred_uid, ses->cred_uid))
return 0;
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.1.y | Success | Success |
prev parent reply other threads:[~2025-03-18 15:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-16 7:39 FAILED: patch "[PATCH] smb: client: Fix match_session bug preventing session reuse" failed to apply to 6.1-stable tree gregkh
2025-03-17 22:30 ` [PATCH 6.1.y] smb: client: Fix match_session bug preventing session reuse Henrique Carvalho
2025-03-18 15:12 ` Sasha Levin [this message]
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=20250317204702-eac2b7fc286a666e@stable.kernel.org \
--to=sashal@kernel.org \
--cc=henrique.carvalho@suse.com \
--cc=stable@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox