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.1.12-108.0.20170806_1300~9
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d7c96681380e1563308d06e6066572e84c4584d8;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>

Orabug: 26401569

(backport upstream commit ce31513a9114f74fe3e9caa6534d201bdac7238d)
call d_inode to get inode from dentry.

Signed-off-by: Shan Hai <shan.hai@oracle.com>
Reviewed-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
---

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 7d6fbe73bd49d..5fdfc7471fd7d 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -919,7 +919,12 @@ ovl_posix_acl_xattr_set(struct dentry *dentry, const char *name,
 
 	posix_acl_release(acl);
 
-	return ovl_xattr_set(dentry, name, value, size, flags);
+	err = ovl_xattr_set(dentry, name, value, size, flags);
+	if (!err)
+		ovl_copyattr(ovl_inode_real(d_inode(dentry), NULL),
+				 d_inode(dentry));
+
+	return err;
 
 out_acl_release:
 	posix_acl_release(acl);