Commit cfce08c6 authored by Christian Pulvermacher's avatar Christian Pulvermacher Committed by Tyler Hicks

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: default avatarChristian Pulvermacher <pulvermacher@gmx.de>
Cc: stable@kernel.org
Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
parent 3a60a168
...@@ -1043,7 +1043,7 @@ ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value, ...@@ -1043,7 +1043,7 @@ ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,
lower_dentry = ecryptfs_dentry_to_lower(dentry); lower_dentry = ecryptfs_dentry_to_lower(dentry);
if (!lower_dentry->d_inode->i_op->setxattr) { if (!lower_dentry->d_inode->i_op->setxattr) {
rc = -ENOSYS; rc = -EOPNOTSUPP;
goto out; goto out;
} }
mutex_lock(&lower_dentry->d_inode->i_mutex); mutex_lock(&lower_dentry->d_inode->i_mutex);
...@@ -1061,7 +1061,7 @@ ecryptfs_getxattr_lower(struct dentry *lower_dentry, const char *name, ...@@ -1061,7 +1061,7 @@ ecryptfs_getxattr_lower(struct dentry *lower_dentry, const char *name,
int rc = 0; int rc = 0;
if (!lower_dentry->d_inode->i_op->getxattr) { if (!lower_dentry->d_inode->i_op->getxattr) {
rc = -ENOSYS; rc = -EOPNOTSUPP;
goto out; goto out;
} }
mutex_lock(&lower_dentry->d_inode->i_mutex); mutex_lock(&lower_dentry->d_inode->i_mutex);
...@@ -1088,7 +1088,7 @@ ecryptfs_listxattr(struct dentry *dentry, char *list, size_t size) ...@@ -1088,7 +1088,7 @@ ecryptfs_listxattr(struct dentry *dentry, char *list, size_t size)
lower_dentry = ecryptfs_dentry_to_lower(dentry); lower_dentry = ecryptfs_dentry_to_lower(dentry);
if (!lower_dentry->d_inode->i_op->listxattr) { if (!lower_dentry->d_inode->i_op->listxattr) {
rc = -ENOSYS; rc = -EOPNOTSUPP;
goto out; goto out;
} }
mutex_lock(&lower_dentry->d_inode->i_mutex); mutex_lock(&lower_dentry->d_inode->i_mutex);
...@@ -1105,7 +1105,7 @@ static int ecryptfs_removexattr(struct dentry *dentry, const char *name) ...@@ -1105,7 +1105,7 @@ static int ecryptfs_removexattr(struct dentry *dentry, const char *name)
lower_dentry = ecryptfs_dentry_to_lower(dentry); lower_dentry = ecryptfs_dentry_to_lower(dentry);
if (!lower_dentry->d_inode->i_op->removexattr) { if (!lower_dentry->d_inode->i_op->removexattr) {
rc = -ENOSYS; rc = -EOPNOTSUPP;
goto out; goto out;
} }
mutex_lock(&lower_dentry->d_inode->i_mutex); mutex_lock(&lower_dentry->d_inode->i_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment