Commit 7c06514a authored by Aurelien Aptel's avatar Aurelien Aptel Committed by Steve French
Browse files

cifs: multichannel: always zero struct cifs_io_parms 



SMB2_read/SMB2_write check and use cifs_io_parms->server, which might
be uninitialized memory.

This change makes all callers zero-initialize the struct.

Signed-off-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 8e84a61a

fs/cifs/file.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1853,7 +1853,7 @@ cifs_write(struct cifsFileInfo *open_file, __u32 pid, const char *write_data, 
	unsigned int xid;

	unsigned int xid;

	struct dentry *dentry = open_file->dentry;

	struct dentry *dentry = open_file->dentry;

	struct cifsInodeInfo *cifsi = CIFS_I(d_inode(dentry));

	struct cifsInodeInfo *cifsi = CIFS_I(d_inode(dentry));

	struct cifs_io_parms io_parms;

	struct cifs_io_parms io_parms = {0};





	cifs_dbg(FYI, "write %zd bytes to offset %lld of %pd\n",

	cifs_dbg(FYI, "write %zd bytes to offset %lld of %pd\n",

		 write_size, *offset, dentry);

		 write_size, *offset, dentry);
@@ -4014,7 +4014,7 @@ cifs_read(struct file *file, char *read_data, size_t read_size, loff_t *offset) 
	unsigned int xid;

	unsigned int xid;

	char *cur_offset;

	char *cur_offset;

	struct cifsFileInfo *open_file;

	struct cifsFileInfo *open_file;

	struct cifs_io_parms io_parms;

	struct cifs_io_parms io_parms = {0};

	int buf_type = CIFS_NO_BUFFER;

	int buf_type = CIFS_NO_BUFFER;

	__u32 pid;

	__u32 pid;

fs/cifs/inode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -447,7 +447,7 @@ cifs_sfu_type(struct cifs_fattr *fattr, const char *path, 
	struct cifs_tcon *tcon;

	struct cifs_tcon *tcon;

	struct cifs_fid fid;

	struct cifs_fid fid;

	struct cifs_open_parms oparms;

	struct cifs_open_parms oparms;

	struct cifs_io_parms io_parms;

	struct cifs_io_parms io_parms = {0};

	char buf[24];

	char buf[24];

	unsigned int bytes_read;

	unsigned int bytes_read;

	char *pbuf;

	char *pbuf;

fs/cifs/link.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -308,7 +308,7 @@ cifs_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, 
	int oplock = 0;

	int oplock = 0;

	struct cifs_fid fid;

	struct cifs_fid fid;

	struct cifs_open_parms oparms;

	struct cifs_open_parms oparms;

	struct cifs_io_parms io_parms;

	struct cifs_io_parms io_parms = {0};

	int buf_type = CIFS_NO_BUFFER;

	int buf_type = CIFS_NO_BUFFER;

	FILE_ALL_INFO file_info;

	FILE_ALL_INFO file_info;
@@ -352,7 +352,7 @@ cifs_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, 
	int oplock = 0;

	int oplock = 0;

	struct cifs_fid fid;

	struct cifs_fid fid;

	struct cifs_open_parms oparms;

	struct cifs_open_parms oparms;

	struct cifs_io_parms io_parms;

	struct cifs_io_parms io_parms = {0};





	oparms.tcon = tcon;

	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.cifs_sb = cifs_sb;
@@ -389,7 +389,7 @@ smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, 
	int rc;

	int rc;

	struct cifs_fid fid;

	struct cifs_fid fid;

	struct cifs_open_parms oparms;

	struct cifs_open_parms oparms;

	struct cifs_io_parms io_parms;

	struct cifs_io_parms io_parms = {0};

	int buf_type = CIFS_NO_BUFFER;

	int buf_type = CIFS_NO_BUFFER;

	__le16 *utf16_path;

	__le16 *utf16_path;

	__u8 oplock = SMB2_OPLOCK_LEVEL_NONE;

	__u8 oplock = SMB2_OPLOCK_LEVEL_NONE;

fs/cifs/smb2ops.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4584,7 +4584,7 @@ smb2_make_node(unsigned int xid, struct inode *inode, 
	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	int rc = -EPERM;

	int rc = -EPERM;

	FILE_ALL_INFO *buf = NULL;

	FILE_ALL_INFO *buf = NULL;

	struct cifs_io_parms io_parms;

	struct cifs_io_parms io_parms = {0};

	__u32 oplock = 0;

	__u32 oplock = 0;

	struct cifs_fid fid;

	struct cifs_fid fid;

	struct cifs_open_parms oparms;

	struct cifs_open_parms oparms;