Commit 48b512e6 authored Oct 05, 2010 by Roberto Sassu Committed by Tyler Hicks Oct 29, 2010

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().

Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Cc: stable <stable@kernel.org>
Cc: Dustin Kirkland <kirkland@canonical.com>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>

parent f6f94e2a

fs/ecryptfs/inode.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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"

		@@ -1108,10 +1109,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;
		}

Admin message