cifs: file: initialize oparms.reconnect before using it
Subsystems (2)
PATCH 2/2 cifs: file: initialize oparms.reconnect before using it
In the cifs_reopen_file function, if the following statement is asserted:
(tcon->unix_ext && cap_unix(tcon->ses) &&
(CIFS_UNIX_POSIX_PATH_OPS_CAP & (tcon->fsUnixInfo.Capability)))
and we succeed to open with cifs_posix_open, the function jumps to the label reopen_success and checks for oparms.reconnect which is not initialized.
To avoid this the oparms structure initialization is anticipated before the if statement.
--- fs/cifs/file.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
fs/cifs/file.c +9 -9
@@ -632,6 +632,15 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush)else oplock =0 ; + oparms.tcon = tcon; + oparms.cifs_sb = cifs_sb; + oparms.desired_access = desired_access; + oparms.create_options = create_options; + oparms.disposition = disposition; + oparms.path = full_path; + oparms.fid = &cfile->fid; + oparms.reconnect = true; +if (tcon->unix_ext &&cap_unix (tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &le64_to_cpu (tcon->fsUnixInfo.Capability))) {
@@ -663,15 +672,6 @@ 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 = create_options; - oparms.disposition = disposition; - oparms.path = full_path; - oparms.fid = &cfile->fid; - oparms.reconnect = true; -/* * Can not refresh inode by passing in file_info buf to be returned by * CIFSSMBOpen and then calling get_inode_info with returned buf since
Signature · 1 line
1.8.3.2
This is patch 1/1, not 2/2... messed up with git.
Andi
Quoted 57 lines · Andi Shyti
In the
cifs_reopen_filefunction, if the following statement is asserted:(
tcon->unix_ext&&cap_unix(tcon->ses)&&(CIFS_UNIX_POSIX_PATH_OPS_CAP & (tcon->fsUnixInfo.Capability)))and we succeed to open with
cifs_posix_open, the function jumps to the labelreopen_successand checks for oparms.reconnect which is not initialized.To avoid this the oparms structure initialization is anticipated before the if statement.
Signed-off-by Andi Shyti <[email protected]>--- fs/cifs/file.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)fs/cifs/file.c +9
-9@@ -632,6 +632,15 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush)else oplock =0 ; + oparms.tcon = tcon; + oparms.cifs_sb = cifs_sb; + oparms.desired_access = desired_access; + oparms.create_options = create_options; + oparms.disposition = disposition; + oparms.path = full_path; + oparms.fid = &cfile->fid; + oparms.reconnect = true; +if (tcon->unix_ext &&cap_unix (tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &le64_to_cpu (tcon->fsUnixInfo.Capability))) {@@ -663,15 +672,6 @@ 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 = create_options; - oparms.disposition = disposition; - oparms.path = full_path; - oparms.fid = &cfile->fid; - oparms.reconnect = true; -/* * Can not refresh inode by passing in file_info buf to be returned by * CIFSSMBOpen and then calling get_inode_info with returned buf since Signature · 1 line
1.8.3.2