diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-07-23 11:48:17 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-07-23 11:48:17 +0200 |
commit | b59f2b4d30c187160df597bae41cabe497b6acf4 (patch) | |
tree | e29ed9e3cbaf777cc1a10c99c4542985002d2c88 /security/capability.c | |
parent | 1e40c2edef2537f87f94d0baf80aeaeb7d51cc23 (diff) | |
parent | 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b (diff) |
Merge tag 'v3.11-rc2' into core/locking
Merge in Linux 3.11-rc2 before moving on with new work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/capability.c')
-rw-r--r-- | security/capability.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c index d32e16e3c6ae..32b515766df1 100644 --- a/security/capability.c +++ b/security/capability.c @@ -858,7 +858,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, |