summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2019-04-01 03:01:57 +0100
committerBen Hutchings <ben@decadent.org.uk>2019-04-04 16:14:11 +0100
commit553ae0f9207b1779e4da88b53f3a1f0cb0c127c6 (patch)
treec81444b1721073e9e5bb6fafe02222a2b8a51bd5
parentac6c8783b756a5c42d7cb808f929d9c5fc94a1c5 (diff)
Revert "cifs: empty TargetInfo leads to crash on recovery"
Revert commit 36a0db05310fbee38b59fed7e1306c1a095f8c8f, a minimal backport of commit cabfb3680f78981d26c078a26e5c748531257ebb upstream. We need a complete backport to avoid a regression for SMB3 authenticated mounts. Reported-by: Stephan Seitz <stse+debian@fsing.rootsland.net> References: https://lists.debian.org/debian-lts/2019/03/msg00071.html Cc: Dan Aloni <dan@kernelim.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--fs/cifs/smb2pdu.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 7ae11fe72b11..219fdc07aa6b 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -608,7 +608,6 @@ SMB2_sess_setup(const unsigned int xid, struct cifs_ses *ses,
*/
kfree(ses->auth_key.response);
ses->auth_key.response = NULL;
- ses->auth_key.len = 0;
/*
* If memory allocation is successful, caller of this function
@@ -769,7 +768,6 @@ ssetup_exit:
rc = server->ops->generate_signingkey(ses);
kfree(ses->auth_key.response);
ses->auth_key.response = NULL;
- ses->auth_key.len = 0;
if (rc) {
cifs_dbg(FYI,
"SMB3 session key generation failed\n");
@@ -794,7 +792,6 @@ keygen_exit:
if (!server->sign) {
kfree(ses->auth_key.response);
ses->auth_key.response = NULL;
- ses->auth_key.len = 0;
}
kfree(ses->ntlmssp);