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

Commit a6e44cb2 authored by Amir Goldstein's avatar Amir Goldstein Committed by Greg Kroah-Hartman
Browse files

SMB3: Backup intent flag missing from some more ops 



[ Upstream commit 0f060936e490c6279dfe773d75d526d3d3d77111 ]

When "backup intent" is requested on the mount (e.g. backupuid or
backupgid mount options), the corresponding flag was missing from
some of the operations.

Change all operations to use the macro cifs_create_options() to
set the backup intent flag if needed.

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Stable-dep-of: d447e794a372 ("cifs: Fix uninitialized memory read in smb3_qfs_tcon()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1b48c70f

fs/cifs/cifsacl.c

+4 −10
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	struct cifs_ntsd *pntsd = NULL;

	int oplock = 0;

	unsigned int xid;

	int rc, create_options = 0;

	int rc;

	struct cifs_tcon *tcon;

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);

	struct cifs_fid fid;
@@ -1068,13 +1068,10 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, 
	tcon = tlink_tcon(tlink);

	xid = get_xid();



	if (backup_cred(cifs_sb))

		create_options |= CREATE_OPEN_BACKUP_INTENT;



	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = READ_CONTROL;

	oparms.create_options = create_options;

	oparms.create_options = cifs_create_options(cifs_sb, 0);

	oparms.disposition = FILE_OPEN;

	oparms.path = path;

	oparms.fid = &fid;
@@ -1119,7 +1116,7 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
{

	int oplock = 0;

	unsigned int xid;

	int rc, access_flags, create_options = 0;

	int rc, access_flags;

	struct cifs_tcon *tcon;

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

	struct tcon_link *tlink = cifs_sb_tlink(cifs_sb);
@@ -1132,9 +1129,6 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
	tcon = tlink_tcon(tlink);

	xid = get_xid();



	if (backup_cred(cifs_sb))

		create_options |= CREATE_OPEN_BACKUP_INTENT;



	if (aclflag == CIFS_ACL_OWNER || aclflag == CIFS_ACL_GROUP)

		access_flags = WRITE_OWNER;

	else
@@ -1143,7 +1137,7 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, 
	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;

	oparms.desired_access = access_flags;

	oparms.create_options = create_options;

	oparms.create_options = cifs_create_options(cifs_sb, 0);

	oparms.disposition = FILE_OPEN;

	oparms.path = path;

	oparms.fid = &fid;

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	buf->f_ffree = 0;	/* unlimited */



	if (server->ops->queryfs)

		rc = server->ops->queryfs(xid, tcon, buf);

		rc = server->ops->queryfs(xid, tcon, cifs_sb, buf);



	free_xid(xid);

	return rc;

fs/cifs/cifsglob.h

+4 −2
Original line number Diff line number Diff line
@@ -300,7 +300,8 @@ struct smb_version_operations { 
			     const char *, struct dfs_info3_param **,

			     unsigned int *, const struct nls_table *, int);

	/* informational QFS call */

	void (*qfs_tcon)(const unsigned int, struct cifs_tcon *);

	void (*qfs_tcon)(const unsigned int, struct cifs_tcon *,

			 struct cifs_sb_info *);

	/* check if a path is accessible or not */

	int (*is_path_accessible)(const unsigned int, struct cifs_tcon *,

				  struct cifs_sb_info *, const char *);
@@ -408,7 +409,7 @@ struct smb_version_operations { 
			       struct cifsInodeInfo *);

	/* query remote filesystem */

	int (*queryfs)(const unsigned int, struct cifs_tcon *,

		       struct kstatfs *);

		       struct cifs_sb_info *, struct kstatfs *);

	/* send mandatory brlock to the server */

	int (*mand_lock)(const unsigned int, struct cifsFileInfo *, __u64,

			 __u64, __u32, int, int, bool);
@@ -489,6 +490,7 @@ struct smb_version_operations { 
	/* ioctl passthrough for query_info */

	int (*ioctl_query_info)(const unsigned int xid,

				struct cifs_tcon *tcon,

				struct cifs_sb_info *cifs_sb,

				__le16 *path, int is_dir,

				unsigned long p);

	/* make unix special files (block, char, fifo, socket) */

fs/cifs/cifsproto.h

+8 −0
Original line number Diff line number Diff line
@@ -600,4 +600,12 @@ static inline int get_dfs_path(const unsigned int xid, struct cifs_ses *ses, 
}

#endif



static inline int cifs_create_options(struct cifs_sb_info *cifs_sb, int options)

{

	if (backup_cred(cifs_sb))

		return options | CREATE_OPEN_BACKUP_INTENT;

	else

		return options;

}



#endif			/* _CIFSPROTO_H */

fs/cifs/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -4319,7 +4319,7 @@ static int mount_get_conns(struct smb_vol *vol, struct cifs_sb_info *cifs_sb, 


	/* do not care if a following call succeed - informational */

	if (!tcon->pipe && server->ops->qfs_tcon) {

		server->ops->qfs_tcon(*xid, tcon);

		server->ops->qfs_tcon(*xid, tcon, cifs_sb);

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RO_CACHE) {

			if (tcon->fsDevInfo.DeviceCharacteristics &

			    cpu_to_le32(FILE_READ_ONLY_DEVICE))