ecryptfs: call vfs_setxattr() in ecryptfs_setxattr()
Subsystems (2)
PATCH v2 1/1 ecryptfs: call vfs_setxattr() in ecryptfs_setxattr()
Ecryptfs is a stackable filesystem which relies on lower filesystems the ability of setting/getting extended attributes.
If there is a security module enabled on the system it updates the 'security' field of inodes according to the owned extended attribute set with the function vfs_setxattr(). When this function is performed on a ecryptfs filesystem the 'security' field is not updated for the lower filesystem since the call security_inode_post_setxattr() is missing for the lower inode.
Further, the call security_inode_setxattr() is missing for the lower inode, leading to policy violations in the security module because specific checks for this hook are not performed (i. e. filesystem 'associate' permission on SELinux is not checked for the lower filesystem).
This patch replaces the call of the setxattr() method of the lower inode in the function ecryptfs_setxattr() with vfs_setxattr().
--- fs/ecryptfs/inode.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)
fs/ecryptfs/inode.c +3 -4
@@ -32,6 +32,7 @@#include <linux/crypto.h> #include <linux/fs_stack.h> #include <linux/slab.h> +#include <linux/xattr.h> #include <asm/unaligned.h> #include "ecryptfs_kernel.h"
@@ -1016,10 +1017,8 @@ ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value, rc = -EOPNOTSUPP ; goto out; } -mutex_lock (&lower_dentry->d_inode->i_mutex); - rc = lower_dentry->d_inode->i_op->setxattr (lower_dentry, name, value, - size, flags); -mutex_unlock (&lower_dentry->d_inode->i_mutex); + + rc =vfs_setxattr (lower_dentry, name, value, size, flags); out:return rc; }
Signature · 1 line
1.7.2.3
Quoted 14 lines · Roberto Sassu
Ecryptfs is a stackable filesystem which relies on lower filesystems the ability of setting/getting extended attributes.
If there is a security module enabled on the system it updates the 'security' field of inodes according to the owned extended attribute set with the function
vfs_setxattr(). When this function is performed on a ecryptfs filesystem the 'security' field is not updated for the lower filesystem since the callsecurity_inode_post_setxattr()is missing for the lower inode.
Further, the callsecurity_inode_setxattr()is missing for the lower inode, leading to policy violations in the security module because specific checks for this hook are not performed (i. e. filesystem 'associate' permission on SELinux is not checked for the lower filesystem).
Quoted 6 lines
This patch replaces the call of the
setxattr()method of the lower inode in the functionecryptfs_setxattr()withvfs_setxattr().Signed-off-by Roberto Sassu <[email protected]>Reviewed-by Tyler Hicks <[email protected]>
Signature · 2 lines
James Morris <[email protected]>
Quoted 14 lines · Roberto Sassu
Ecryptfs is a stackable filesystem which relies on lower filesystems the ability of setting/getting extended attributes.
If there is a security module enabled on the system it updates the 'security' field of inodes according to the owned extended attribute set with the function
vfs_setxattr(). When this function is performed on a ecryptfs filesystem the 'security' field is not updated for the lower filesystem since the callsecurity_inode_post_setxattr()is missing for the lower inode.
Further, the callsecurity_inode_setxattr()is missing for the lower inode, leading to policy violations in the security module because specific checks for this hook are not performed (i. e. filesystem 'associate' permission on SELinux is not checked for the lower filesystem).
Quoted 7 lines
This patch replaces the call of the
setxattr()method of the lower inode in the functionecryptfs_setxattr()withvfs_setxattr().Signed-off-by Roberto Sassu <[email protected]>Reviewed-by Tyler Hicks <[email protected]>---
Applied togit://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next
Thanks!
Quoted 30 lines
fs/ecryptfs/inode.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-)fs/ecryptfs/inode.c +3
-4@@ -32,6 +32,7 @@#include <linux/crypto.h> #include <linux/fs_stack.h> #include <linux/slab.h> +#include <linux/xattr.h> #include <asm/unaligned.h> #include "ecryptfs_kernel.h" @@ -1016,10 +1017,8 @@ ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value, rc = -EOPNOTSUPP ; goto out; } -mutex_lock (&lower_dentry->d_inode->i_mutex); - rc = lower_dentry->d_inode->i_op->setxattr (lower_dentry, name, value, - size, flags); -mutex_unlock (&lower_dentry->d_inode->i_mutex); + + rc =vfs_setxattr (lower_dentry, name, value, size, flags); out:return rc; }Signature · 1 line
1.7.2.3