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

Commit c11b9fdd authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

ovl: remove posix_acl_default from workdir 



Clear out posix acl xattrs on workdir and also reset the mode after
creation so that an inherited sgid bit is cleared.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Cc: <stable@vger.kernel.org>
parent 38b25697

fs/overlayfs/super.c

+19 −0
Original line number Diff line number Diff line
@@ -814,6 +814,10 @@ static struct dentry *ovl_workdir_create(struct vfsmount *mnt, 
		struct kstat stat = {

			.mode = S_IFDIR | 0,

		};

		struct iattr attr = {

			.ia_valid = ATTR_MODE,

			.ia_mode = stat.mode,

		};



		if (work->d_inode) {

			err = -EEXIST;
@@ -829,6 +833,21 @@ static struct dentry *ovl_workdir_create(struct vfsmount *mnt, 
		err = ovl_create_real(dir, work, &stat, NULL, NULL, true);

		if (err)

			goto out_dput;



		err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_DEFAULT);

		if (err && err != -ENODATA)

			goto out_dput;



		err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_ACCESS);

		if (err && err != -ENODATA)

			goto out_dput;



		/* Clear any inherited mode bits */

		inode_lock(work->d_inode);

		err = notify_change(work, &attr, NULL);

		inode_unlock(work->d_inode);

		if (err)

			goto out_dput;

	}

out_unlock:

	inode_unlock(dir);