cifs: Fix uninitialized memory reads for oparms.mode

Use a struct assignment with implicit member initialization

Signed-off-by: Volker Lendecke <vl@samba.org>
Cc: stable@vger.kernel.org
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifs/cached_dir.c b/fs/cifs/cached_dir.c
index 6039908..b36ae64 100644 (file)
--- a/fs/cifs/cached_dir.c
+++ b/fs/cifs/cached_dir.c
@@ -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);

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index bbf58c2..3cc3471 100644 (file)
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -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) {

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 23f10e0..8c014a3 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -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)

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index ad4208b..1bf6177 100644 (file)
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -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);

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 7eb476a..e216bc9 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -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

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index f145a59..7d0cc39 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -508,14 +508,15 @@ cifs_sfu_type(struct cifs_fattr *fattr, const char *path,
                return PTR_ERR(tlink);
        tcon = tlink_tcon(tlink);
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       oparms.desired_access = GENERIC_READ;
-       oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR);
-       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 = GENERIC_READ,
+               .create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR),
+               .disposition = FILE_OPEN,
+               .path = path,
+               .fid = &fid,
+       };
 
        if (tcon->ses->server->oplocks)
                oplock = REQ_OPLOCK;
@@ -1518,14 +1519,15 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,
                goto out;
        }
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       oparms.desired_access = DELETE | FILE_WRITE_ATTRIBUTES;
-       oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR);
-       oparms.disposition = FILE_OPEN;
-       oparms.path = full_path;
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .cifs_sb = cifs_sb,
+               .desired_access = DELETE | FILE_WRITE_ATTRIBUTES,
+               .create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR),
+               .disposition = FILE_OPEN,
+               .path = full_path,
+               .fid = &fid,
+       };
 
        rc = CIFS_open(xid, &oparms, &oplock, NULL);
        if (rc != 0)
@@ -2112,15 +2114,16 @@ cifs_do_rename(const unsigned int xid, struct dentry *from_dentry,
        if (to_dentry->d_parent != from_dentry->d_parent)
                goto do_rename_exit;
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       /* open the file to be renamed -- we need DELETE perms */
-       oparms.desired_access = DELETE;
-       oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR);
-       oparms.disposition = FILE_OPEN;
-       oparms.path = from_path;
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .cifs_sb = cifs_sb,
+               /* open the file to be renamed -- we need DELETE perms */
+               .desired_access = DELETE,
+               .create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR),
+               .disposition = FILE_OPEN,
+               .path = from_path,
+               .fid = &fid,
+       };
 
        rc = CIFS_open(xid, &oparms, &oplock, NULL);
        if (rc == 0) {

diff --git a/fs/cifs/link.c b/fs/cifs/link.c
index a5a097a..d937eed 100644 (file)
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
@@ -271,14 +271,15 @@ cifs_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
        int buf_type = CIFS_NO_BUFFER;
        FILE_ALL_INFO file_info;
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       oparms.desired_access = GENERIC_READ;
-       oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR);
-       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 = GENERIC_READ,
+               .create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR),
+               .disposition = FILE_OPEN,
+               .path = path,
+               .fid = &fid,
+       };
 
        rc = CIFS_open(xid, &oparms, &oplock, &file_info);
        if (rc)
@@ -313,14 +314,15 @@ cifs_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
        struct cifs_open_parms oparms;
        struct cifs_io_parms io_parms = {0};
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       oparms.desired_access = GENERIC_WRITE;
-       oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR);
-       oparms.disposition = FILE_CREATE;
-       oparms.path = path;
-       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, CREATE_NOT_DIR),
+               .disposition = FILE_CREATE,
+               .path = path,
+               .fid = &fid,
+       };
 
        rc = CIFS_open(xid, &oparms, &oplock, NULL);
        if (rc)
@@ -355,13 +357,14 @@ smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
        __u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
        struct smb2_file_all_info *pfile_info = NULL;
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       oparms.desired_access = GENERIC_READ;
-       oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR);
-       oparms.disposition = FILE_OPEN;
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .cifs_sb = cifs_sb,
+               .desired_access = GENERIC_READ,
+               .create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR),
+               .disposition = FILE_OPEN,
+               .fid = &fid,
+       };
 
        utf16_path = cifs_convert_path_to_utf16(path, cifs_sb);
        if (utf16_path == NULL)
@@ -421,14 +424,15 @@ smb3_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
        if (!utf16_path)
                return -ENOMEM;
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       oparms.desired_access = GENERIC_WRITE;
-       oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR);
-       oparms.disposition = FILE_CREATE;
-       oparms.fid = &fid;
-       oparms.reconnect = false;
-       oparms.mode = 0644;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .cifs_sb = cifs_sb,
+               .desired_access = GENERIC_WRITE,
+               .create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR),
+               .disposition = FILE_CREATE,
+               .fid = &fid,
+               .mode = 0644,
+       };
 
        rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL,
                       NULL, NULL);

diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index 4cb3644..abda614 100644 (file)
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -576,14 +576,15 @@ static int cifs_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
                if (!(le32_to_cpu(fi.Attributes) & ATTR_REPARSE))
                        return 0;
 
-               oparms.tcon = tcon;
-               oparms.cifs_sb = cifs_sb;
-               oparms.desired_access = FILE_READ_ATTRIBUTES;
-               oparms.create_options = cifs_create_options(cifs_sb, 0);
-               oparms.disposition = FILE_OPEN;
-               oparms.path = full_path;
-               oparms.fid = &fid;
-               oparms.reconnect = false;
+               oparms = (struct cifs_open_parms) {
+                       .tcon = tcon,
+                       .cifs_sb = cifs_sb,
+                       .desired_access = FILE_READ_ATTRIBUTES,
+                       .create_options = cifs_create_options(cifs_sb, 0),
+                       .disposition = FILE_OPEN,
+                       .path = full_path,
+                       .fid = &fid,
+               };
 
                /* Need to check if this is a symbolic link or not */
                tmprc = CIFS_open(xid, &oparms, &oplock, NULL);
@@ -823,14 +824,15 @@ smb_set_file_info(struct inode *inode, const char *full_path,
                goto out;
        }
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       oparms.desired_access = SYNCHRONIZE | FILE_WRITE_ATTRIBUTES;
-       oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR);
-       oparms.disposition = FILE_OPEN;
-       oparms.path = full_path;
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .cifs_sb = cifs_sb,
+               .desired_access = SYNCHRONIZE | FILE_WRITE_ATTRIBUTES,
+               .create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR),
+               .disposition = FILE_OPEN,
+               .path = full_path,
+               .fid = &fid,
+       };
 
        cifs_dbg(FYI, "calling SetFileInfo since SetPathInfo for times not supported by this server\n");
        rc = CIFS_open(xid, &oparms, &oplock, NULL);
@@ -998,15 +1000,16 @@ cifs_query_symlink(const unsigned int xid, struct cifs_tcon *tcon,
                goto out;
        }
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       oparms.desired_access = FILE_READ_ATTRIBUTES;
-       oparms.create_options = cifs_create_options(cifs_sb,
-                                                   OPEN_REPARSE_POINT);
-       oparms.disposition = FILE_OPEN;
-       oparms.path = full_path;
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .cifs_sb = cifs_sb,
+               .desired_access = FILE_READ_ATTRIBUTES,
+               .create_options = cifs_create_options(cifs_sb,
+                                                     OPEN_REPARSE_POINT),
+               .disposition = FILE_OPEN,
+               .path = full_path,
+               .fid = &fid,
+       };
 
        rc = CIFS_open(xid, &oparms, &oplock, NULL);
        if (rc)
@@ -1115,15 +1118,16 @@ cifs_make_node(unsigned int xid, struct inode *inode,
 
        cifs_dbg(FYI, "sfu compat create special file\n");
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       oparms.desired_access = GENERIC_WRITE;
-       oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR |
-                                                   CREATE_OPTION_SPECIAL);
-       oparms.disposition = FILE_CREATE;
-       oparms.path = full_path;
-       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, CREATE_NOT_DIR |
+                                                     CREATE_OPTION_SPECIAL),
+               .disposition = FILE_CREATE,
+               .path = full_path,
+               .fid = &fid,
+       };
 
        if (tcon->ses->server->oplocks)
                oplock = REQ_OPLOCK;

diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index 8521adf..37b4cd5 100644 (file)
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -105,14 +105,15 @@ static int smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
                goto finished;
        }
 
-       vars->oparms.tcon = tcon;
-       vars->oparms.desired_access = desired_access;
-       vars->oparms.disposition = create_disposition;
-       vars->oparms.create_options = cifs_create_options(cifs_sb, create_options);
-       vars->oparms.fid = &fid;
-       vars->oparms.reconnect = false;
-       vars->oparms.mode = mode;
-       vars->oparms.cifs_sb = cifs_sb;
+       vars->oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = desired_access,
+               .disposition = create_disposition,
+               .create_options = cifs_create_options(cifs_sb, create_options),
+               .fid = &fid,
+               .mode = mode,
+               .cifs_sb = cifs_sb,
+       };
 
        rqst[num_rqst].rq_iov = &vars->open_iov[0];
        rqst[num_rqst].rq_nvec = SMB2_CREATE_IOV_SIZE;

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index f22d360..43beec5 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -772,12 +772,13 @@ smb2_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon,
        struct cifs_open_parms oparms;
        struct cifs_fid fid;
 
-       oparms.tcon = tcon;
-       oparms.desired_access = FILE_READ_ATTRIBUTES;
-       oparms.disposition = FILE_OPEN;
-       oparms.create_options = cifs_create_options(cifs_sb, 0);
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = FILE_READ_ATTRIBUTES,
+               .disposition = FILE_OPEN,
+               .create_options = cifs_create_options(cifs_sb, 0),
+               .fid = &fid,
+       };
 
        rc = SMB2_open(xid, &oparms, &srch_path, &oplock, NULL, NULL,
                       NULL, NULL);
@@ -817,12 +818,13 @@ smb2_is_path_accessible(const unsigned int xid, struct cifs_tcon *tcon,
        if (!utf16_path)
                return -ENOMEM;
 
-       oparms.tcon = tcon;
-       oparms.desired_access = FILE_READ_ATTRIBUTES;
-       oparms.disposition = FILE_OPEN;
-       oparms.create_options = cifs_create_options(cifs_sb, 0);
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = FILE_READ_ATTRIBUTES,
+               .disposition = FILE_OPEN,
+               .create_options = cifs_create_options(cifs_sb, 0),
+               .fid = &fid,
+       };
 
        rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL,
                       &err_iov, &err_buftype);
@@ -1098,13 +1100,13 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
        rqst[0].rq_iov = open_iov;
        rqst[0].rq_nvec = SMB2_CREATE_IOV_SIZE;
 
-       memset(&oparms, 0, sizeof(oparms));
-       oparms.tcon = tcon;
-       oparms.desired_access = FILE_WRITE_EA;
-       oparms.disposition = FILE_OPEN;
-       oparms.create_options = cifs_create_options(cifs_sb, 0);
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = FILE_WRITE_EA,
+               .disposition = FILE_OPEN,
+               .create_options = cifs_create_options(cifs_sb, 0),
+               .fid = &fid,
+       };
 
        rc = SMB2_open_init(tcon, server,
                            &rqst[0], &oplock, &oparms, utf16_path);
@@ -1454,12 +1456,12 @@ smb2_ioctl_query_info(const unsigned int xid,
        rqst[0].rq_iov = &vars->open_iov[0];
        rqst[0].rq_nvec = SMB2_CREATE_IOV_SIZE;
 
-       memset(&oparms, 0, sizeof(oparms));
-       oparms.tcon = tcon;
-       oparms.disposition = FILE_OPEN;
-       oparms.create_options = cifs_create_options(cifs_sb, create_options);
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .disposition = FILE_OPEN,
+               .create_options = cifs_create_options(cifs_sb, create_options),
+               .fid = &fid,
+       };
 
        if (qi.flags & PASSTHRU_FSCTL) {
                switch (qi.info_type & FSCTL_DEVICE_ACCESS_MASK) {
@@ -2089,12 +2091,13 @@ smb3_notify(const unsigned int xid, struct file *pfile,
        }
 
        tcon = cifs_sb_master_tcon(cifs_sb);
-       oparms.tcon = tcon;
-       oparms.desired_access = FILE_READ_ATTRIBUTES | FILE_READ_DATA;
-       oparms.disposition = FILE_OPEN;
-       oparms.create_options = cifs_create_options(cifs_sb, 0);
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = FILE_READ_ATTRIBUTES | FILE_READ_DATA,
+               .disposition = FILE_OPEN,
+               .create_options = cifs_create_options(cifs_sb, 0),
+               .fid = &fid,
+       };
 
        rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL, NULL,
                       NULL);
@@ -2160,12 +2163,13 @@ smb2_query_dir_first(const 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.desired_access = FILE_READ_ATTRIBUTES | FILE_READ_DATA;
-       oparms.disposition = FILE_OPEN;
-       oparms.create_options = cifs_create_options(cifs_sb, 0);
-       oparms.fid = fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = FILE_READ_ATTRIBUTES | FILE_READ_DATA,
+               .disposition = FILE_OPEN,
+               .create_options = cifs_create_options(cifs_sb, 0),
+               .fid = fid,
+       };
 
        rc = SMB2_open_init(tcon, server,
                            &rqst[0], &oplock, &oparms, utf16_path);
@@ -2491,12 +2495,13 @@ smb2_query_info_compound(const 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.desired_access = desired_access;
-       oparms.disposition = FILE_OPEN;
-       oparms.create_options = cifs_create_options(cifs_sb, 0);
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = desired_access,
+               .disposition = FILE_OPEN,
+               .create_options = cifs_create_options(cifs_sb, 0),
+               .fid = &fid,
+       };
 
        rc = SMB2_open_init(tcon, server,
                            &rqst[0], &oplock, &oparms, utf16_path);
@@ -2624,12 +2629,13 @@ smb311_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
        if (!tcon->posix_extensions)
                return smb2_queryfs(xid, tcon, cifs_sb, buf);
 
-       oparms.tcon = tcon;
-       oparms.desired_access = FILE_READ_ATTRIBUTES;
-       oparms.disposition = FILE_OPEN;
-       oparms.create_options = cifs_create_options(cifs_sb, 0);
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = FILE_READ_ATTRIBUTES,
+               .disposition = FILE_OPEN,
+               .create_options = cifs_create_options(cifs_sb, 0),
+               .fid = &fid,
+       };
 
        rc = SMB2_open(xid, &oparms, &srch_path, &oplock, NULL, NULL,
                       NULL, NULL);
@@ -2917,13 +2923,13 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon,
        rqst[0].rq_iov = open_iov;
        rqst[0].rq_nvec = SMB2_CREATE_IOV_SIZE;
 
-       memset(&oparms, 0, sizeof(oparms));
-       oparms.tcon = tcon;
-       oparms.desired_access = FILE_READ_ATTRIBUTES;
-       oparms.disposition = FILE_OPEN;
-       oparms.create_options = cifs_create_options(cifs_sb, create_options);
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = FILE_READ_ATTRIBUTES,
+               .disposition = FILE_OPEN,
+               .create_options = cifs_create_options(cifs_sb, create_options),
+               .fid = &fid,
+       };
 
        rc = SMB2_open_init(tcon, server,
                            &rqst[0], &oplock, &oparms, utf16_path);
@@ -3057,13 +3063,13 @@ smb2_query_reparse_tag(const unsigned int xid, struct cifs_tcon *tcon,
        rqst[0].rq_iov = open_iov;
        rqst[0].rq_nvec = SMB2_CREATE_IOV_SIZE;
 
-       memset(&oparms, 0, sizeof(oparms));
-       oparms.tcon = tcon;
-       oparms.desired_access = FILE_READ_ATTRIBUTES;
-       oparms.disposition = FILE_OPEN;
-       oparms.create_options = cifs_create_options(cifs_sb, OPEN_REPARSE_POINT);
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = FILE_READ_ATTRIBUTES,
+               .disposition = FILE_OPEN,
+               .create_options = cifs_create_options(cifs_sb, OPEN_REPARSE_POINT),
+               .fid = &fid,
+       };
 
        rc = SMB2_open_init(tcon, server,
                            &rqst[0], &oplock, &oparms, utf16_path);
@@ -3197,17 +3203,20 @@ get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb,
                return ERR_PTR(rc);
        }
 
-       oparms.tcon = tcon;
-       oparms.desired_access = READ_CONTROL;
-       oparms.disposition = FILE_OPEN;
-       /*
-        * When querying an ACL, even if the file is a symlink we want to open
-        * the source not the target, and so the protocol requires that the
-        * client specify this flag when opening a reparse point
-        */
-       oparms.create_options = cifs_create_options(cifs_sb, 0) | OPEN_REPARSE_POINT;
-       oparms.fid = &fid;
-       oparms.reconnect = false;
+       oparms = (struct cifs_open_parms) {
+               .tcon = tcon,
+               .desired_access = READ_CONTROL,
+               .disposition = FILE_OPEN,
+               /*
+                * When querying an ACL, even if the file is a symlink
+                * we want to open the source not the target, and so
+                * the protocol requires that the client specify this
+                * flag when opening a reparse point
+                */
+               .create_options = cifs_create_options(cifs_sb, 0) |
+                                 OPEN_REPARSE_POINT,
+               .fid = &fid,
+       };
 
        if (info & SACL_SECINFO)
                oparms.desired_access |= SYSTEM_SECURITY;
@@ -3266,13 +3275,14 @@ set_smb2_acl(struct cifs_ntsd *pnntsd, __u32 acllen,
                return rc;
        }
 
-       oparms.tcon = tcon;
-       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,
+               .desired_access = access_flags,
+               .create_options = cifs_create_options(cifs_sb, 0),
+               .disposition = FILE_OPEN,
+               .path = path,
+               .fid = &fid,
+       };
 
        rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL,
                       NULL, NULL);
@@ -5139,15 +5149,16 @@ smb2_make_node(unsigned int xid, struct inode *inode,
 
        cifs_dbg(FYI, "sfu compat create special file\n");
 
-       oparms.tcon = tcon;
-       oparms.cifs_sb = cifs_sb;
-       oparms.desired_access = GENERIC_WRITE;
-       oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR |
-                                                   CREATE_OPTION_SPECIAL);
-       oparms.disposition = FILE_CREATE;
-       oparms.path = full_path;
-       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, CREATE_NOT_DIR |
+                                                     CREATE_OPTION_SPECIAL),
+               .disposition = FILE_CREATE,
+               .path = full_path,
+               .fid = &fid,
+       };
 
        if (tcon->ses->server->oplocks)
                oplock = REQ_OPLOCK;