Skip to contentSkip to conversation

Patch "ovl: remove posix_acl_default from workdir" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Sep 12, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ovl: remove posix_acl_default from workdir

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ovl-remove-posix_acl_default-from-workdir.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c11b9fdd6a612f376a5e886505f1c54c16d8c380 Mon Sep 17 00:00:00 2001

From: Miklos Szeredi <[email protected]>
Date: Thu, 1 Sep 2016 11:11:59 +0200
Subject: ovl: remove posix_acl_default from workdir

From: Miklos Szeredi <[email protected]>

commit c11b9fdd6a612f376a5e886505f1c54c16d8c380 upstream.

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

---
 fs/overlayfs/super.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
fs/overlayfs/super.c +19 -0
@@ -798,6 +798,10 @@ retry:
 		struct kstat stat = {
 			.mode = S_IFDIR | 0,
 		};
+		struct iattr attr = {
+			.ia_valid = ATTR_MODE,
+			.ia_mode = stat.mode,
+		};
 
 		if (work->d_inode) {
 			err = -EEXIST;
@@ -813,6 +817,21 @@ retry:
 		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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/ovl-listxattr-use-strnlen.patch queue-4.7/ovl-remove-posix_acl_default-from-workdir.patch queue-4.7/ovl-don-t-copy-up-opaqueness.patch queue-4.7/ovl-proper-cleanup-of-workdir.patch queue-4.7/ovl-fix-workdir-creation.patch