Commit fa70b87c authored by Steve French's avatar Steve French
Browse files

SMB3: GUIDs should be constructed as random but valid uuids 



GUIDs although random, and 16 bytes, need to be generated as
proper uuids.

Signed-off-by: default avatarSteve French <steve.french@primarydata.com>
Reviewed-by: default avatarAurelien Aptel <aaptel@suse.com>
Reported-by: default avatarDavid Goebels <davidgoe@microsoft.com>
CC: Stable <stable@vger.kernel.org>
parent c2afb814

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ cifs_alloc_inode(struct super_block *sb) 
	cifs_inode->createtime = 0;

	cifs_inode->epoch = 0;

#ifdef CONFIG_CIFS_SMB2

	get_random_bytes(cifs_inode->lease_key, SMB2_LEASE_KEY_SIZE);

	generate_random_uuid(cifs_inode->lease_key);

#endif

	/*

	 * Can not set i_flags here - they get immediately overwritten to zero

fs/cifs/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -2163,7 +2163,7 @@ cifs_get_tcp_session(struct smb_vol *volume_info) 
	memcpy(&tcp_ses->dstaddr, &volume_info->dstaddr,

		sizeof(tcp_ses->dstaddr));

#ifdef CONFIG_CIFS_SMB2

	get_random_bytes(tcp_ses->client_guid, SMB2_CLIENT_GUID_SIZE);

	generate_random_uuid(tcp_ses->client_guid);

#endif

	/*

	 * at this point we are the only ones with the pointer

fs/cifs/smb2ops.c

+1 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ smb2_set_lease_key(struct inode *inode, struct cifs_fid *fid) 
static void

smb2_new_lease_key(struct cifs_fid *fid)

{

	get_random_bytes(fid->lease_key, SMB2_LEASE_KEY_SIZE);

	generate_random_uuid(fid->lease_key);

}



#define SMB2_SYMLINK_STRUCT_SIZE \

fs/cifs/smb2pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ create_durable_v2_buf(struct cifs_fid *pfid) 


	buf->dcontext.Timeout = 0; /* Should this be configurable by workload */

	buf->dcontext.Flags = cpu_to_le32(SMB2_DHANDLE_FLAG_PERSISTENT);

	get_random_bytes(buf->dcontext.CreateGuid, 16);

	generate_random_uuid(buf->dcontext.CreateGuid);

	memcpy(pfid->create_guid, buf->dcontext.CreateGuid, 16);



	/* SMB2_CREATE_DURABLE_HANDLE_REQUEST is "DH2Q" */

CRA Git | Maintained and supported by SUSTech CRA and CCSE