| From: Ronnie Sahlberg <lsahlber@redhat.com> |
| Date: Wed, 5 Feb 2020 11:08:01 +1000 |
| Subject: cifs: fail i/o on soft mounts if sessionsetup errors out |
| |
| commit b0dd940e582b6a60296b9847a54012a4b080dc72 upstream. |
| |
| 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> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| fs/cifs/smb2pdu.c | 10 ++++++++-- |
| 1 file changed, 8 insertions(+), 2 deletions(-) |
| |
| --- a/fs/cifs/smb2pdu.c |
| +++ b/fs/cifs/smb2pdu.c |
| @@ -250,9 +250,14 @@ smb2_reconnect(__le16 smb2_command, stru |
| */ |
| mutex_lock(&tcon->ses->session_mutex); |
| 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; |
| @@ -290,6 +295,7 @@ out: |
| case SMB2_SET_INFO: |
| rc = -EAGAIN; |
| } |
| +failed: |
| unload_nls(nls_codepage); |
| return rc; |
| } |
