Commit 797805d8 authored by William Liu's avatar William Liu Committed by Steve French
Browse files

ksmbd: check nt_len to be at least CIFS_ENCPWD_SIZE in ksmbd_decode_ntlmssp_auth_blob 



"nt_len - CIFS_ENCPWD_SIZE" is passed directly from
ksmbd_decode_ntlmssp_auth_blob to ksmbd_auth_ntlmv2. Malicious requests
can set nt_len to less than CIFS_ENCPWD_SIZE, which results in a negative
number (or large unsigned value) used for a subsequent memcpy in
ksmbd_auth_ntlvm2 and can cause a panic.

Fixes: e2f34481 ("cifsd: add server-side procedures for SMB3")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarWilliam Liu <will@willsroot.io>
Signed-off-by: default avatarHrvoje Mišetić <misetichrvoje@gmail.com>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent cdfb2fef

fs/ksmbd/auth.c

+2 −1
Original line number Diff line number Diff line
@@ -322,7 +322,8 @@ int ksmbd_decode_ntlmssp_auth_blob(struct authenticate_message *authblob, 
	dn_off = le32_to_cpu(authblob->DomainName.BufferOffset);

	dn_len = le16_to_cpu(authblob->DomainName.Length);



	if (blob_len < (u64)dn_off + dn_len || blob_len < (u64)nt_off + nt_len)

	if (blob_len < (u64)dn_off + dn_len || blob_len < (u64)nt_off + nt_len ||

	    nt_len < CIFS_ENCPWD_SIZE)

		return -EINVAL;



	/* TODO : use domain name that imported from configuration file */