Commit 7cb3def4 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: handle large EA requests more gracefully in smb2+ 



Update reading the EA using increasingly larger buffer sizes
until the response will fit in the buffer, or we exceed the
(arbitrary) maximum set to 64kb.

Without this change, a user is able to add more and more EAs using
setfattr until the point where the total space of all EAs exceed 2kb
at which point the user can no longer list the EAs at all
and getfattr will abort with an error.

The same issue still exists for EAs in SMB1.

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Reported-by: default avatarXiaoli Feng <xifeng@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 06e22908

fs/cifs/smb2maperror.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static const struct status_to_posix_error smb2_error_map_table[] = { 
	{STATUS_DATATYPE_MISALIGNMENT, -EIO, "STATUS_DATATYPE_MISALIGNMENT"},

	{STATUS_BREAKPOINT, -EIO, "STATUS_BREAKPOINT"},

	{STATUS_SINGLE_STEP, -EIO, "STATUS_SINGLE_STEP"},

	{STATUS_BUFFER_OVERFLOW, -EIO, "STATUS_BUFFER_OVERFLOW"},

	{STATUS_BUFFER_OVERFLOW, -E2BIG, "STATUS_BUFFER_OVERFLOW"},

	{STATUS_NO_MORE_FILES, -ENODATA, "STATUS_NO_MORE_FILES"},

	{STATUS_WAKE_SYSTEM_DEBUGGER, -EIO, "STATUS_WAKE_SYSTEM_DEBUGGER"},

	{STATUS_HANDLES_CLOSED, -EIO, "STATUS_HANDLES_CLOSED"},

fs/cifs/smb2ops.c

+25 −6
Original line number Diff line number Diff line
@@ -522,6 +522,7 @@ smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon, 
	struct cifs_open_parms oparms;

	struct cifs_fid fid;

	struct smb2_file_full_ea_info *smb2_data;

	int ea_buf_size = SMB2_MIN_EA_BUF;



	utf16_path = cifs_convert_path_to_utf16(path, cifs_sb);

	if (!utf16_path)
@@ -541,14 +542,32 @@ smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon, 
		return rc;

	}



	smb2_data = kzalloc(SMB2_MAX_EA_BUF, GFP_KERNEL);

	while (1) {

		smb2_data = kzalloc(ea_buf_size, GFP_KERNEL);

		if (smb2_data == NULL) {

		SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);

			SMB2_close(xid, tcon, fid.persistent_fid,

				   fid.volatile_fid);

			return -ENOMEM;

		}



	rc = SMB2_query_eas(xid, tcon, fid.persistent_fid, fid.volatile_fid,

			    smb2_data);

		rc = SMB2_query_eas(xid, tcon, fid.persistent_fid,

				    fid.volatile_fid,

				    ea_buf_size, smb2_data);



		if (rc != -E2BIG)

			break;



		kfree(smb2_data);

		ea_buf_size <<= 1;



		if (ea_buf_size > SMB2_MAX_EA_BUF) {

			cifs_dbg(VFS, "EA size is too large\n");

			SMB2_close(xid, tcon, fid.persistent_fid,

				   fid.volatile_fid);

			return -ENOMEM;

		}

	}



	SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);



	if (!rc)

fs/cifs/smb2pdu.c

+3 −3
Original line number Diff line number Diff line
@@ -2234,11 +2234,11 @@ qinf_exit: 


int SMB2_query_eas(const unsigned int xid, struct cifs_tcon *tcon,

		   u64 persistent_fid, u64 volatile_fid,

	struct smb2_file_full_ea_info *data)

		   int ea_buf_size, struct smb2_file_full_ea_info *data)

{

	return query_info(xid, tcon, persistent_fid, volatile_fid,

			  FILE_FULL_EA_INFORMATION, SMB2_O_INFO_FILE, 0,

			  SMB2_MAX_EA_BUF,

			  ea_buf_size,

			  sizeof(struct smb2_file_full_ea_info),

			  (void **)&data,

			  NULL);

fs/cifs/smb2pdu.h

+2 −1
Original line number Diff line number Diff line
@@ -1178,7 +1178,8 @@ struct smb2_file_link_info { /* encoding of request for level 11 */ 
	char   FileName[0];     /* Name to be assigned to new link */

} __packed; /* level 11 Set */



#define SMB2_MAX_EA_BUF 2048

#define SMB2_MIN_EA_BUF  2048

#define SMB2_MAX_EA_BUF 65536



struct smb2_file_full_ea_info { /* encoding of response for level 15 */

	__le32 next_entry_offset;

fs/cifs/smb2proto.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ extern int SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon, 
		      u64 persistent_file_id, u64 volatile_file_id);

extern int SMB2_query_eas(const unsigned int xid, struct cifs_tcon *tcon,

			  u64 persistent_file_id, u64 volatile_file_id,

			  int ea_buf_size,

			  struct smb2_file_full_ea_info *data);

extern int SMB2_query_info(const unsigned int xid, struct cifs_tcon *tcon,

			   u64 persistent_file_id, u64 volatile_file_id,

CRA Git | Maintained and supported by SUSTech CRA and CCSE