aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@canonical.com>2012-02-07 17:55:40 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-29 16:33:41 -0800
commitd870401f171a25a362ae7ce1eeebafdd3fc080fd (patch)
tree23791ce1dc22a4eb6f6fb54efad9b9bc1a451765 /fs/ecryptfs
parentaa4e084812c0f03c0363bacdad6a0fff95826544 (diff)
downloadkernel_samsung_smdk4412-d870401f171a25a362ae7ce1eeebafdd3fc080fd.zip
kernel_samsung_smdk4412-d870401f171a25a362ae7ce1eeebafdd3fc080fd.tar.gz
kernel_samsung_smdk4412-d870401f171a25a362ae7ce1eeebafdd3fc080fd.tar.bz2
eCryptfs: Copy up lower inode attrs after setting lower xattr
commit 545d680938be1e86a6c5250701ce9abaf360c495 upstream. After passing through a ->setxattr() call, eCryptfs needs to copy the inode attributes from the lower inode to the eCryptfs inode, as they may have changed in the lower filesystem's ->setxattr() path. One example is if an extended attribute containing a POSIX Access Control List is being set. The new ACL may cause the lower filesystem to modify the mode of the lower inode and the eCryptfs inode would need to be updated to reflect the new mode. https://launchpad.net/bugs/926292 Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Reported-by: Sebastien Bacher <seb128@ubuntu.com> Cc: John Johansen <john.johansen@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/inode.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index e3562f2..2717329 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -1119,6 +1119,8 @@ ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,
}
rc = vfs_setxattr(lower_dentry, name, value, size, flags);
+ if (!rc)
+ fsstack_copy_attr_all(dentry->d_inode, lower_dentry->d_inode);
out:
return rc;
}