From: Miklos Szeredi <mszeredi@redhat.com>
Date: Thu, 1 Sep 2016 09:12:00 +0000 (+0200)
Subject: ovl: copyattr after setting POSIX ACL
X-Git-Tag: v4.8-rc5~17^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ce31513a9114f74fe3e9caa6534d201bdac7238d;p=users%2Fjedix%2Flinux-maple.git

ovl: copyattr after setting POSIX ACL

Setting POSIX acl may also modify the file mode, so need to copy that up to
the overlay inode.

Reported-by: Eryu Guan <eguan@redhat.com>
Fixes: d837a49bd57f ("ovl: fix POSIX ACL setting")
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 45a2eb0b4693..cba2c9fea98c 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -1018,7 +1018,11 @@ ovl_posix_acl_xattr_set(const struct xattr_handler *handler,
 
 	posix_acl_release(acl);
 
-	return ovl_xattr_set(dentry, handler->name, value, size, flags);
+	err = ovl_xattr_set(dentry, handler->name, value, size, flags);
+	if (!err)
+		ovl_copyattr(ovl_inode_real(inode, NULL), inode);
+
+	return err;
 
 out_acl_release:
 	posix_acl_release(acl);