From: Rishabh Bhatnagar <risbhat@amazon.com>
To: <gregkh@linuxfoundation.org>
Cc: <sfrench@samba.org>, <stable@vger.kernel.org>,
<linux-cifs@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Paulo Alcantara <pc@cjr.nz>, Aurelien Aptel <aaptel@suse.com>,
Steve French <stfrench@microsoft.com>,
Rishabh Bhatnagar <risbhat@amazon.com>
Subject: [PATCH 5.10 2/2] cifs: handle empty list of targets in cifs_reconnect()
Date: Wed, 7 Jun 2023 18:53:13 +0000 [thread overview]
Message-ID: <20230607185313.11363-3-risbhat@amazon.com> (raw)
In-Reply-To: <20230607185313.11363-1-risbhat@amazon.com>
From: Paulo Alcantara <pc@cjr.nz>
commit a52930353eaf443489a350a135c5525a4acbbf56 upstream.
In case there were no cached DFS referrals in
reconn_setup_dfs_targets(), set cifs_sb to NULL prior to calling
reconn_set_next_dfs_target() so it would not try to access an empty
tgt_list.
Signed-off-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Rishabh Bhatnagar <risbhat@amazon.com>
---
fs/cifs/connect.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index b5cd3dc479ce..d8d9d9061544 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -513,11 +513,13 @@ cifs_reconnect(struct TCP_Server_Info *server)
sb = NULL;
} else {
cifs_sb = CIFS_SB(sb);
-
rc = reconn_setup_dfs_targets(cifs_sb, &tgt_list);
- if (rc && (rc != -EOPNOTSUPP)) {
- cifs_server_dbg(VFS, "%s: no target servers for DFS failover\n",
- __func__);
+ if (rc) {
+ cifs_sb = NULL;
+ if (rc != -EOPNOTSUPP) {
+ cifs_server_dbg(VFS, "%s: no target servers for DFS failover\n",
+ __func__);
+ }
} else {
server->nr_targets = dfs_cache_get_nr_tgts(&tgt_list);
}
--
2.39.2
next prev parent reply other threads:[~2023-06-07 18:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-07 18:53 [PATCH 5.4 0/2] Backport few dfs related fixes to cifs Rishabh Bhatnagar
2023-06-07 18:53 ` [PATCH 5.10 1/2] cifs: get rid of unused parameter in reconn_setup_dfs_targets() Rishabh Bhatnagar
2023-06-07 18:53 ` Rishabh Bhatnagar [this message]
2023-06-07 19:07 ` [PATCH 5.4 0/2] Backport few dfs related fixes to cifs Greg KH
2023-06-07 20:20 ` Bhatnagar, Rishabh
2023-06-07 20:36 ` Greg KH
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=20230607185313.11363-3-risbhat@amazon.com \
--to=risbhat@amazon.com \
--cc=aaptel@suse.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pc@cjr.nz \
--cc=sfrench@samba.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).