summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJ. Bruce Fields2013-05-09 00:05:41 +0200
committerJ. Bruce Fields2013-05-13 16:11:46 +0200
commit0d422afb892e3f993cf934b76a2c2ef839c446e0 (patch)
tree3452717e0d811102b87ad71e9039df39cf7ef112 /security
parentnfsd4: store correct client minorversion for >=4.2 (diff)
downloadkernel-qcow2-linux-0d422afb892e3f993cf934b76a2c2ef839c446e0.tar.gz
kernel-qcow2-linux-0d422afb892e3f993cf934b76a2c2ef839c446e0.tar.xz
kernel-qcow2-linux-0d422afb892e3f993cf934b76a2c2ef839c446e0.zip
security: cap_inode_getsecctx returning garbage
We shouldn't be returning success from this function without also filling in the return values ctx and ctxlen. Note currently this doesn't appear to cause bugs since the only inode_getsecctx caller I can find is fs/sysfs/inode.c, which only calls this if security_inode_setsecurity succeeds. Assuming security_inode_setsecurity is set to cap_inode_setsecurity whenever inode_getsecctx is set to cap_inode_getsecctx, this function can never actually called. So I noticed this only because the server labeled NFS patches add a real caller. Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'security')
-rw-r--r--security/capability.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c
index 1728d4e375db..83efc90b344d 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -843,7 +843,7 @@ static int cap_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen)
static int cap_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
{
- return 0;
+ return -EOPNOTSUPP;
}
#ifdef CONFIG_KEYS
static int cap_key_alloc(struct key *key, const struct cred *cred,