Commit 5fa2cffb authored by Steve French's avatar Steve French
Browse files

smb3: check xattr value length earlier 



Coverity complains about assigning a pointer based on
value length before checking that value length goes
beyond the end of the SMB.  Although this is even more
unlikely as value length is a single byte, and the
pointer is not dereferenced until laterm, it is clearer
to check the lengths first.

Addresses-Coverity: 1467704 ("Speculative execution data leak")
Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 3d7cb6b0

fs/cifs/smb2ops.c

+3 −2
Original line number Diff line number Diff line
@@ -1145,9 +1145,7 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size, 
	size_t name_len, value_len, user_name_len;



	while (src_size > 0) {

		name = &src->ea_data[0];

		name_len = (size_t)src->ea_name_length;

		value = &src->ea_data[src->ea_name_length + 1];

		value_len = (size_t)le16_to_cpu(src->ea_value_length);



		if (name_len == 0)
@@ -1159,6 +1157,9 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size, 
			goto out;

		}



		name = &src->ea_data[0];

		value = &src->ea_data[src->ea_name_length + 1];



		if (ea_name) {

			if (ea_name_len == name_len &&

			    memcmp(ea_name, name, name_len) == 0) {