Commit 9934430e authored by Steve French's avatar Steve French
Browse files

SMB3.1.1: Fix ids returned in POSIX query dir 



We were setting the uid/gid to the default in each dir entry
in the parsing of the POSIX query dir response, rather
than attempting to map the user and group SIDs returned by
the server to well known SIDs (or upcall if not found).

CC: Stable <stable@vger.kernel.org>
Reviewed-by: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 9eec21bf

fs/cifs/cifsacl.c

+3 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ invalidate_key: 
	goto out_key_put;

}



static int

int

sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,

		struct cifs_fattr *fattr, uint sidtype)

{
@@ -359,7 +359,8 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid, 
		return -EIO;

	}



	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UID_FROM_ACL) {

	if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UID_FROM_ACL) ||

	    (cifs_sb_master_tcon(cifs_sb)->posix_extensions)) {

		uint32_t unix_id;

		bool is_group;

fs/cifs/cifsproto.h

+2 −0
Original line number Diff line number Diff line
@@ -209,6 +209,8 @@ extern int cifs_set_file_info(struct inode *inode, struct iattr *attrs, 
extern int cifs_rename_pending_delete(const char *full_path,

				      struct dentry *dentry,

				      const unsigned int xid);

extern int sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,

				struct cifs_fattr *fattr, uint sidtype);

extern int cifs_acl_to_fattr(struct cifs_sb_info *cifs_sb,

			      struct cifs_fattr *fattr, struct inode *inode,

			      bool get_mode_from_special_sid,

fs/cifs/readdir.c

+2 −3
Original line number Diff line number Diff line
@@ -267,9 +267,8 @@ cifs_posix_to_fattr(struct cifs_fattr *fattr, struct smb2_posix_info *info, 
	if (reparse_file_needs_reval(fattr))

		fattr->cf_flags |= CIFS_FATTR_NEED_REVAL;



	/* TODO map SIDs */

	fattr->cf_uid = cifs_sb->mnt_uid;

	fattr->cf_gid = cifs_sb->mnt_gid;

	sid_to_id(cifs_sb, &parsed.owner, fattr, SIDOWNER);

	sid_to_id(cifs_sb, &parsed.group, fattr, SIDGROUP);

}



static void __dir_info_to_fattr(struct cifs_fattr *fattr, const void *info)

CRA Git | Maintained and supported by SUSTech CRA and CCSE