aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-01-14 09:33:28 +1100
committerJames Morris <jmorris@namei.org>2010-01-15 08:23:57 +1100
commit8d9525048c74786205b99f3fcd05a839721edfb7 (patch)
treee09c056c9888410aea680deda092ca9b85fc77e2 /security
parentTOMOYO: Remove memory pool for list elements. (diff)
downloadlinux-dev-8d9525048c74786205b99f3fcd05a839721edfb7.tar.xz
linux-dev-8d9525048c74786205b99f3fcd05a839721edfb7.zip
security: correct error returns for get/set security with private inodes
Currently, the getsecurity and setsecurity operations return zero for kernel private inodes, where xattrs are not available directly to userspace. This confuses some applications, and does not conform to the man page for getxattr(2) etc., which state that these syscalls should return ENOTSUP if xattrs are not supported or disabled. Note that in the listsecurity case, we still need to return zero as we don't know which other xattr handlers may be active. For discussion of userland confusion, see: http://www.mail-archive.com/bug-coreutils@gnu.org/msg17988.html This patch corrects the error returns so that ENOTSUP is reported to userspace as required. Signed-off-by: James Morris <jmorris@namei.org> Acked-by: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: Serge Hallyn <serue@us.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/security.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c
index f2d8aa949323..440afe5eb54c 100644
--- a/security/security.c
+++ b/security/security.c
@@ -630,14 +630,14 @@ int security_inode_killpriv(struct dentry *dentry)
int security_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc)
{
if (unlikely(IS_PRIVATE(inode)))
- return 0;
+ return -EOPNOTSUPP;
return security_ops->inode_getsecurity(inode, name, buffer, alloc);
}
int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags)
{
if (unlikely(IS_PRIVATE(inode)))
- return 0;
+ return -EOPNOTSUPP;
return security_ops->inode_setsecurity(inode, name, value, size, flags);
}