aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorChristian Pulvermacher <pulvermacher@gmx.de>2010-03-23 12:51:38 -0400
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2010-04-19 15:42:09 -0400
commitcfce08c6bdfb20ade979284e55001ca1f100ed51 (patch)
tree598510daaec037baf1088533cd366b5f37c05a1c /fs/ecryptfs
parent3a60a1686f0d51c99bd0df8ac93050fb6dfce647 (diff)
ecryptfs: fix error code for missing xattrs in lower fs
If the lower file system driver has extended attributes disabled, ecryptfs' own access functions return -ENOSYS instead of -EOPNOTSUPP. This breaks execution of programs in the ecryptfs mount, since the kernel expects the latter error when checking for security capabilities in xattrs. Signed-off-by: Christian Pulvermacher <pulvermacher@gmx.de> Cc: stable@kernel.org Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/inode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index 605f514f3b4..efd4f47d530 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -1043,7 +1043,7 @@ ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,
1043 1043
1044 lower_dentry = ecryptfs_dentry_to_lower(dentry); 1044 lower_dentry = ecryptfs_dentry_to_lower(dentry);
1045 if (!lower_dentry->d_inode->i_op->setxattr) { 1045 if (!lower_dentry->d_inode->i_op->setxattr) {
1046 rc = -ENOSYS; 1046 rc = -EOPNOTSUPP;
1047 goto out; 1047 goto out;
1048 } 1048 }
1049 mutex_lock(&lower_dentry->d_inode->i_mutex); 1049 mutex_lock(&lower_dentry->d_inode->i_mutex);
@@ -1061,7 +1061,7 @@ ecryptfs_getxattr_lower(struct dentry *lower_dentry, const char *name,
1061 int rc = 0; 1061 int rc = 0;
1062 1062
1063 if (!lower_dentry->d_inode->i_op->getxattr) { 1063 if (!lower_dentry->d_inode->i_op->getxattr) {
1064 rc = -ENOSYS; 1064 rc = -EOPNOTSUPP;
1065 goto out; 1065 goto out;
1066 } 1066 }
1067 mutex_lock(&lower_dentry->d_inode->i_mutex); 1067 mutex_lock(&lower_dentry->d_inode->i_mutex);
@@ -1088,7 +1088,7 @@ ecryptfs_listxattr(struct dentry *dentry, char *list, size_t size)
1088 1088
1089 lower_dentry = ecryptfs_dentry_to_lower(dentry); 1089 lower_dentry = ecryptfs_dentry_to_lower(dentry);
1090 if (!lower_dentry->d_inode->i_op->listxattr) { 1090 if (!lower_dentry->d_inode->i_op->listxattr) {
1091 rc = -ENOSYS; 1091 rc = -EOPNOTSUPP;
1092 goto out; 1092 goto out;
1093 } 1093 }
1094 mutex_lock(&lower_dentry->d_inode->i_mutex); 1094 mutex_lock(&lower_dentry->d_inode->i_mutex);
@@ -1105,7 +1105,7 @@ static int ecryptfs_removexattr(struct dentry *dentry, const char *name)
1105 1105
1106 lower_dentry = ecryptfs_dentry_to_lower(dentry); 1106 lower_dentry = ecryptfs_dentry_to_lower(dentry);
1107 if (!lower_dentry->d_inode->i_op->removexattr) { 1107 if (!lower_dentry->d_inode->i_op->removexattr) {
1108 rc = -ENOSYS; 1108 rc = -EOPNOTSUPP;
1109 goto out; 1109 goto out;
1110 } 1110 }
1111 mutex_lock(&lower_dentry->d_inode->i_mutex); 1111 mutex_lock(&lower_dentry->d_inode->i_mutex);