Commit 1460720c authored by Meetakshi Setiya's avatar Meetakshi Setiya Committed by Steve French
Browse files

cifs: Add client version details to NTLM authenticate message 



The NTLM authenticate message currently sets the NTLMSSP_NEGOTIATE_VERSION
flag but does not populate the VERSION structure. This commit fixes this
bug by ensuring that the flag is set and the version details are included
in the message.

Signed-off-by: default avatarMeetakshi Setiya <msetiya@microsoft.com>
Reviewed-by: default avatarBharath SM <bharathsm@microsoft.com>
Reviewed-by: default avatarPaulo Alcantara (SUSE) <pc@manguebit.com>
Reviewed-by: default avatarShyam Prasad N <sprasad@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 475efd98

fs/smb/client/ntlmssp.h

+2 −2
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ typedef struct _AUTHENTICATE_MESSAGE { 
	SECURITY_BUFFER WorkstationName;

	SECURITY_BUFFER SessionKey;

	__le32 NegotiateFlags;

	/* SECURITY_BUFFER for version info not present since we

	   do not set the version is present flag */

	struct	ntlmssp_version Version;

	/* SECURITY_BUFFER */

	char UserString[];

} __attribute__((packed)) AUTHENTICATE_MESSAGE, *PAUTHENTICATE_MESSAGE;

fs/smb/client/sess.c

+9 −3
Original line number Diff line number Diff line
@@ -1060,10 +1060,16 @@ int build_ntlmssp_auth_blob(unsigned char **pbuffer, 
	memcpy(sec_blob->Signature, NTLMSSP_SIGNATURE, 8);

	sec_blob->MessageType = NtLmAuthenticate;



	/* send version information in ntlmssp authenticate also */

	flags = ses->ntlmssp->server_flags | NTLMSSP_REQUEST_TARGET |

		NTLMSSP_NEGOTIATE_TARGET_INFO | NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED;

	/* we only send version information in ntlmssp negotiate, so do not set this flag */

	flags = flags & ~NTLMSSP_NEGOTIATE_VERSION;

		NTLMSSP_NEGOTIATE_TARGET_INFO | NTLMSSP_NEGOTIATE_VERSION |

		NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED;



	sec_blob->Version.ProductMajorVersion = LINUX_VERSION_MAJOR;

	sec_blob->Version.ProductMinorVersion = LINUX_VERSION_PATCHLEVEL;

	sec_blob->Version.ProductBuild = cpu_to_le16(SMB3_PRODUCT_BUILD);

	sec_blob->Version.NTLMRevisionCurrent = NTLMSSP_REVISION_W2K3;



	tmp = *pbuffer + sizeof(AUTHENTICATE_MESSAGE);

	sec_blob->NegotiateFlags = cpu_to_le32(flags);