aboutsummaryrefslogtreecommitdiff
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <smfrench@gmail.com>2014-10-20 12:48:23 -0500
committerSasha Levin <sasha.levin@oracle.com>2016-07-12 08:47:05 -0400
commit7bc7f2575fa4f145f2eac4e5d66fc77133ccb094 (patch)
treefba2a881bfab6d10cfc32e9bb13a63347de9c6d0 /fs/cifs
parent7e8db29e0d7a75a201cf0ca0dcc93d8954bec55d (diff)
decode_negTokenInit had wrong calling sequence
[ Upstream commit ebdd207e29164d5de70d2b027b8a3a14c603d42c ] For krb5 enablement of SMB3, decoding negprot, caller now passes server struct not the old sec_type Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/smb2pdu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index e8d1f8c59b56..a5ef27d75c24 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -431,8 +431,7 @@ SMB2_negotiate(const unsigned int xid, struct cifs_ses *ses)
if (rc)
goto neg_exit;
if (blob_length)
- rc = decode_neg_token_init(security_blob, blob_length,
- &server->sec_type);
+ rc = decode_negTokenInit(security_blob, blob_length, server);
if (rc == 1)
rc = 0;
else if (rc == 0) {