Commit de036dca authored by Volker Lendecke's avatar Volker Lendecke Committed by Steve French
Browse files

cifs: Fix uninitialized memory reads for oparms.mode 



Use a struct assignment with implicit member initialization

Signed-off-by: default avatarVolker Lendecke <vl@samba.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 5574920c

fs/cifs/cached_dir.c

+7 −6
Original line number Diff line number Diff line
@@ -181,12 +181,13 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon, 
	rqst[0].rq_iov = open_iov;

	rqst[0].rq_nvec = SMB2_CREATE_IOV_SIZE;



	oparms.tcon = tcon;

	oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_FILE);

	oparms.desired_access = FILE_READ_ATTRIBUTES;

	oparms.disposition = FILE_OPEN;

	oparms.fid = pfid;

	oparms.reconnect = false;

	oparms = (struct cifs_open_parms) {

		.tcon = tcon,

		.create_options = cifs_create_options(cifs_sb, CREATE_NOT_FILE),

		.desired_access = FILE_READ_ATTRIBUTES,

		.disposition = FILE_OPEN,

		.fid = pfid,

	};



	rc = SMB2_open_init(tcon, server,

			    &rqst[0], &oplock, &oparms, utf16_path);

fs/cifs/cifsacl.c

+18 −16
Original line number Diff line number Diff line
@@ -1428,14 +1428,15 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	tcon = tlink_tcon(tlink);

	xid = get_xid();



	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = READ_CONTROL;

	oparms.create_options = cifs_create_options(cifs_sb, 0);

	oparms.disposition = FILE_OPEN;

	oparms.path = path;

	oparms.fid = &fid;

	oparms.reconnect = false;

	oparms = (struct cifs_open_parms) {

		.tcon = tcon,

		.cifs_sb = cifs_sb,

		.desired_access = READ_CONTROL,

		.create_options = cifs_create_options(cifs_sb, 0),

		.disposition = FILE_OPEN,

		.path = path,

		.fid = &fid,

	};



	rc = CIFS_open(xid, &oparms, &oplock, NULL);

	if (!rc) {
@@ -1494,14 +1495,15 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
	else

		access_flags = WRITE_DAC;



	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = access_flags;

	oparms.create_options = cifs_create_options(cifs_sb, 0);

	oparms.disposition = FILE_OPEN;

	oparms.path = path;

	oparms.fid = &fid;

	oparms.reconnect = false;

	oparms = (struct cifs_open_parms) {

		.tcon = tcon,

		.cifs_sb = cifs_sb,

		.desired_access = access_flags,

		.create_options = cifs_create_options(cifs_sb, 0),

		.disposition = FILE_OPEN,

		.path = path,

		.fid = &fid,

	};



	rc = CIFS_open(xid, &oparms, &oplock, NULL);

	if (rc) {

fs/cifs/cifssmb.c

+9 −8
Original line number Diff line number Diff line
@@ -5372,14 +5372,15 @@ CIFSSMBSetPathInfoFB(const unsigned int xid, struct cifs_tcon *tcon, 
	struct cifs_fid fid;

	int rc;



	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = GENERIC_WRITE;

	oparms.create_options = cifs_create_options(cifs_sb, 0);

	oparms.disposition = FILE_OPEN;

	oparms.path = fileName;

	oparms.fid = &fid;

	oparms.reconnect = false;

	oparms = (struct cifs_open_parms) {

		.tcon = tcon,

		.cifs_sb = cifs_sb,

		.desired_access = GENERIC_WRITE,

		.create_options = cifs_create_options(cifs_sb, 0),

		.disposition = FILE_OPEN,

		.path = fileName,

		.fid = &fid,

	};



	rc = CIFS_open(xid, &oparms, &oplock, NULL);

	if (rc)

fs/cifs/dir.c

+10 −9
Original line number Diff line number Diff line
@@ -304,15 +304,16 @@ static int cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned 
	if (!tcon->unix_ext && (mode & S_IWUGO) == 0)

		create_options |= CREATE_OPTION_READONLY;



	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = desired_access;

	oparms.create_options = cifs_create_options(cifs_sb, create_options);

	oparms.disposition = disposition;

	oparms.path = full_path;

	oparms.fid = fid;

	oparms.reconnect = false;

	oparms.mode = mode;

	oparms = (struct cifs_open_parms) {

		.tcon = tcon,

		.cifs_sb = cifs_sb,

		.desired_access = desired_access,

		.create_options = cifs_create_options(cifs_sb, create_options),

		.disposition = disposition,

		.path = full_path,

		.fid = fid,

		.mode = mode,

	};

	rc = server->ops->open(xid, &oparms, oplock, buf);

	if (rc) {

		cifs_dbg(FYI, "cifs_create returned 0x%x\n", rc);

fs/cifs/file.c

+19 −16
Original line number Diff line number Diff line
@@ -260,14 +260,15 @@ static int cifs_nt_open(const char *full_path, struct inode *inode, struct cifs_ 
	if (f_flags & O_DIRECT)

		create_options |= CREATE_NO_BUFFER;



	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = desired_access;

	oparms.create_options = cifs_create_options(cifs_sb, create_options);

	oparms.disposition = disposition;

	oparms.path = full_path;

	oparms.fid = fid;

	oparms.reconnect = false;

	oparms = (struct cifs_open_parms) {

		.tcon = tcon,

		.cifs_sb = cifs_sb,

		.desired_access = desired_access,

		.create_options = cifs_create_options(cifs_sb, create_options),

		.disposition = disposition,

		.path = full_path,

		.fid = fid,

	};



	rc = server->ops->open(xid, &oparms, oplock, buf);

	if (rc)
@@ -848,14 +849,16 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) 
	if (server->ops->get_lease_key)

		server->ops->get_lease_key(inode, &cfile->fid);



	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = desired_access;

	oparms.create_options = cifs_create_options(cifs_sb, create_options);

	oparms.disposition = disposition;

	oparms.path = full_path;

	oparms.fid = &cfile->fid;

	oparms.reconnect = true;

	oparms = (struct cifs_open_parms) {

		.tcon = tcon,

		.cifs_sb = cifs_sb,

		.desired_access = desired_access,

		.create_options = cifs_create_options(cifs_sb, create_options),

		.disposition = disposition,

		.path = full_path,

		.fid = &cfile->fid,

		.reconnect = true,

	};



	/*

	 * Can not refresh inode by passing in file_info buf to be returned by