diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2019-06-14 13:02:29 +1000 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-06-17 16:27:02 -0500 |
| commit | 61cabc7b0a5cf0d3c532cfa96594c801743fe7f6 (patch) | |
| tree | 54a1acbd27462f83c01f4f65512cebf0464be995 | |
| parent | 8d526d62db907e786fd88948c75d1833d82bd80e (diff) | |
| download | linux-61cabc7b0a5cf0d3c532cfa96594c801743fe7f6.tar.gz linux-61cabc7b0a5cf0d3c532cfa96594c801743fe7f6.tar.bz2 linux-61cabc7b0a5cf0d3c532cfa96594c801743fe7f6.zip | |
cifs: fix GlobalMid_Lock bug in cifs_reconnect
We can not hold the GlobalMid_Lock spinlock during the
dfs processing in cifs_reconnect since it invokes things that may sleep
and thus trigger :
BUG: sleeping function called from invalid context at kernel/locking/rwsem.c:23
Thus we need to drop the spinlock during this code block.
RHBZ: 1716743
Cc: stable@vger.kernel.org
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
| -rw-r--r-- | fs/cifs/connect.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 8c4121da624e..8dd6637a3cbb 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -476,6 +476,7 @@ cifs_reconnect(struct TCP_Server_Info *server) spin_lock(&GlobalMid_Lock); server->nr_targets = 1; #ifdef CONFIG_CIFS_DFS_UPCALL + spin_unlock(&GlobalMid_Lock); cifs_sb = find_super_by_tcp(server); if (IS_ERR(cifs_sb)) { rc = PTR_ERR(cifs_sb); @@ -493,6 +494,7 @@ cifs_reconnect(struct TCP_Server_Info *server) } cifs_dbg(FYI, "%s: will retry %d target(s)\n", __func__, server->nr_targets); + spin_lock(&GlobalMid_Lock); #endif if (server->tcpStatus == CifsExiting) { /* the demux thread will exit normally |