diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2020-02-05 02:08:01 +0100 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2020-02-05 13:32:41 +0100 |
| commit | b0dd940e582b6a60296b9847a54012a4b080dc72 (patch) | |
| tree | 2594902f0c534725e09d2ed63d641ea490342f7b | |
| parent | smb3: fix problem with null cifs super block with previous patch (diff) | |
| download | linux-b0dd940e582b6a60296b9847a54012a4b080dc72.tar.xz linux-b0dd940e582b6a60296b9847a54012a4b080dc72.zip | |
cifs: fail i/o on soft mounts if sessionsetup errors out
RHBZ: 1579050
If we have a soft mount we should fail commands for session-setup
failures (such as the password having changed/ account being deleted/ ...)
and return an error back to the application.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
CC: Stable <stable@vger.kernel.org>
| -rw-r--r-- | fs/cifs/smb2pdu.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 14f209f7376f..7996d81230aa 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -350,9 +350,14 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon) } rc = cifs_negotiate_protocol(0, tcon->ses); - if (!rc && tcon->ses->need_reconnect) + if (!rc && tcon->ses->need_reconnect) { rc = cifs_setup_session(0, tcon->ses, nls_codepage); - + if ((rc == -EACCES) && !tcon->retry) { + rc = -EHOSTDOWN; + mutex_unlock(&tcon->ses->session_mutex); + goto failed; + } + } if (rc || !tcon->need_reconnect) { mutex_unlock(&tcon->ses->session_mutex); goto out; @@ -397,6 +402,7 @@ out: case SMB2_SET_INFO: rc = -EAGAIN; } +failed: unload_nls(nls_codepage); return rc; } |