On Thu, 6 Jan 2011 09:24:03 -0600
shirishpargaonkar@xxxxxxxxx wrote:
> From: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
>
>
> NTLM response length was changed during to 16 bytes instead of 24 bytes
> that get sent in Tree Connection Request during share-level security
> share mounts. Revert it back to 24 bytes.
>
>
> Reported-by: Grzegorz Ozanski <grzegorz.ozanski@xxxxxxxxx>
> Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
> ---
> fs/cifs/connect.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index 41f002f..cdba196 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -2966,7 +2966,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
> bcc_ptr++; /* skip password */
> /* already aligned so no need to do it below */
> } else {
> - pSMB->PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE);
> + pSMB->PasswordLength = cpu_to_le16(CIFS_AUTH_RESP_SIZE);
> /* BB FIXME add code to fail this if NTLMv2 or Kerberos
> specified as required (when that support is added to
> the vfs in the future) as only NTLM or the much
> @@ -2984,7 +2984,7 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
> #endif /* CIFS_WEAK_PW_HASH */
> SMBNTencrypt(tcon->password, ses->server->cryptkey, bcc_ptr);
>
> - bcc_ptr += CIFS_SESS_KEY_SIZE;
> + bcc_ptr += CIFS_AUTH_RESP_SIZE;
> if (ses->capabilities & CAP_UNICODE) {
> /* must align unicode strings */
> *bcc_ptr = 0; /* null byte password */
Looks ok to me. I'm not well-versed enough in the subtleties of NTLM to
know whether this is correct, so I'll have to just take your word for
it. Doesn't look like it'll harm anything though.
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
