diff options
| author | Steve French <smfrench@gmail.com> | 2014-10-20 13:48:23 -0400 |
|---|---|---|
| committer | Steve French <steve.french@primarydata.com> | 2014-12-07 23:17:19 -0500 |
| commit | ebdd207e29164d5de70d2b027b8a3a14c603d42c (patch) | |
| tree | c5772182c79c09ce32971ecd4bc5e78355e37dbd /fs/cifs/smb2pdu.c | |
| parent | 911a8dfa47a45ff52d771a5b4162ce3b1e55b33d (diff) | |
decode_negTokenInit had wrong calling sequence
For krb5 enablement of SMB3, decoding negprot, caller now passes
server struct not the old sec_type
Diffstat (limited to 'fs/cifs/smb2pdu.c')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 8f1672bb82d5..0ca7f6364754 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) | |||
| 431 | if (rc) | 431 | if (rc) |
| 432 | goto neg_exit; | 432 | goto neg_exit; |
| 433 | if (blob_length) | 433 | if (blob_length) |
| 434 | rc = decode_neg_token_init(security_blob, blob_length, | 434 | rc = decode_negTokenInit(security_blob, blob_length, server); |
| 435 | &server->sec_type); | ||
| 436 | if (rc == 1) | 435 | if (rc == 1) |
| 437 | rc = 0; | 436 | rc = 0; |
| 438 | else if (rc == 0) { | 437 | else if (rc == 0) { |