summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2016-09-01 05:12:00 -0400
committerMiklos Szeredi <mszeredi@redhat.com>2016-09-01 05:12:00 -0400
commitce31513a9114f74fe3e9caa6534d201bdac7238d (patch)
tree22e6072f34525b1e0634a2e01f8f5fb9f2c86a1d /fs
parent0e585ccc13b3edbb187fb4f1b7cc9397f17d64a9 (diff)
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/overlayfs/super.c6
1 files changed, 5 insertions, 1 deletions
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,
1018 1018
1019 posix_acl_release(acl); 1019 posix_acl_release(acl);
1020 1020
1021 return ovl_xattr_set(dentry, handler->name, value, size, flags); 1021 err = ovl_xattr_set(dentry, handler->name, value, size, flags);
1022 if (!err)
1023 ovl_copyattr(ovl_inode_real(inode, NULL), inode);
1024
1025 return err;
1022 1026
1023out_acl_release: 1027out_acl_release:
1024 posix_acl_release(acl); 1028 posix_acl_release(acl);