Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ec672bd authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: update calc_size to take a server argument 



and change the smb2 version to take heder_preamble_size into account
instead of hardcoding it as 4 bytes.

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 14547f7d

fs/cifs/cifsglob.h

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ struct smb_version_operations { 
	int (*close_dir)(const unsigned int, struct cifs_tcon *,

			 struct cifs_fid *);

	/* calculate a size of SMB message */

	unsigned int (*calc_smb_size)(void *);

	unsigned int (*calc_smb_size)(void *buf, struct TCP_Server_Info *ptcpi);

	/* check for STATUS_PENDING and process it in a positive case */

	bool (*is_status_pending)(char *, struct TCP_Server_Info *, int);

	/* check for STATUS_NETWORK_SESSION_EXPIRED */

fs/cifs/cifsproto.h

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ extern void cifs_update_eof(struct cifsInodeInfo *cifsi, loff_t offset, 
			    unsigned int bytes_written);

extern struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *, bool);

extern struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *, bool);

extern unsigned int smbCalcSize(void *buf);

extern unsigned int smbCalcSize(void *buf, struct TCP_Server_Info *server);

extern int decode_negTokenInit(unsigned char *security_blob, int length,

			struct TCP_Server_Info *server);

extern int cifs_convert_address(struct sockaddr *dst, const char *src, int len);

fs/cifs/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ checkSMB(char *buf, unsigned int total_read, struct TCP_Server_Info *server) 
	/* otherwise, there is enough to get to the BCC */

	if (check_smb_hdr(smb))

		return -EIO;

	clc_len = smbCalcSize(smb);

	clc_len = smbCalcSize(smb, server);



	if (4 + rfclen != total_read) {

		cifs_dbg(VFS, "Length read does not match RFC1001 length %d\n",

fs/cifs/netmisc.c

+1 −1
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ map_smb_to_linux_error(char *buf, bool logErr) 
 * portion, the number of word parameters and the data portion of the message

 */

unsigned int

smbCalcSize(void *buf)

smbCalcSize(void *buf, struct TCP_Server_Info *server)

{

	struct smb_hdr *ptr = (struct smb_hdr *)buf;

	return (sizeof(struct smb_hdr) + (2 * ptr->WordCount) +

fs/cifs/readdir.c

+4 −2
Original line number Diff line number Diff line
@@ -650,7 +650,8 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos, 
		char *cur_ent;

		char *end_of_smb = cfile->srch_inf.ntwrk_buf_start +

			server->ops->calc_smb_size(

					cfile->srch_inf.ntwrk_buf_start);

					cfile->srch_inf.ntwrk_buf_start,

					server);



		cur_ent = cfile->srch_inf.srch_entries_start;

		first_entry_in_buffer = cfile->srch_inf.index_of_last_entry
@@ -831,7 +832,8 @@ int cifs_readdir(struct file *file, struct dir_context *ctx) 
	cifs_dbg(FYI, "loop through %d times filling dir for net buf %p\n",

		 num_to_fill, cifsFile->srch_inf.ntwrk_buf_start);

	max_len = tcon->ses->server->ops->calc_smb_size(

			cifsFile->srch_inf.ntwrk_buf_start);

			cifsFile->srch_inf.ntwrk_buf_start,

			tcon->ses->server);

	end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + max_len;



	tmp_buf = kmalloc(UNICODE_NAME_MAX, GFP_KERNEL);