Commit 3bffbe9e authored by Shyam Prasad N's avatar Shyam Prasad N Committed by Steve French
Browse files

cifs: Fix chmod with modefromsid when an older ACE already exists. 



My recent fixes to cifsacl to maintain inherited ACEs had
regressed modefromsid when an older ACL already exists.

Found testing xfstest 495 with modefromsid mount option

Fixes: f5065508 ("cifs: Retain old ACEs when converting between mode bits and ACL")

Signed-off-by: default avatarShyam Prasad N <sprasad@microsoft.com>
Reviewed-by: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 45a4546c

fs/cifs/cifsacl.c

+1 −2
Original line number Diff line number Diff line
@@ -1130,8 +1130,7 @@ static int set_chmod_dacl(struct cifs_acl *pdacl, struct cifs_acl *pndacl, 
		}



		/* If it's any one of the ACE we're replacing, skip! */

		if (!mode_from_sid &&

				((compare_sids(&pntace->sid, &sid_unix_NFS_mode) == 0) ||

		if (((compare_sids(&pntace->sid, &sid_unix_NFS_mode) == 0) ||

				(compare_sids(&pntace->sid, pownersid) == 0) ||

				(compare_sids(&pntace->sid, pgrpsid) == 0) ||

				(compare_sids(&pntace->sid, &sid_everyone) == 0) ||