diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:42 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:42 +0300 |
| commit | cebeb0f1885fa93c44be5d4e0b9b640210ff088c (patch) | |
| tree | a33e4af4ddaa7a57f997ab9a2baceb48209670cd /security/capability.c | |
| parent | 939ecf6b14c46e3448411a934418311b492bfee4 (diff) | |
| parent | 48d11dc37977614a461bfedddc52d1c651bc279f (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'security/capability.c')
| -rw-r--r-- | security/capability.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/security/capability.c b/security/capability.c index 8b4f24ae43381..ad0d4de699447 100644 --- a/security/capability.c +++ b/security/capability.c @@ -116,7 +116,7 @@ static int cap_dentry_init_security(struct dentry *dentry, int mode, struct qstr *name, void **ctx, u32 *ctxlen) { - return 0; + return -EOPNOTSUPP; } static int cap_inode_alloc_security(struct inode *inode) @@ -757,7 +757,8 @@ static void cap_skb_owned_by(struct sk_buff *skb, struct sock *sk) #ifdef CONFIG_SECURITY_NETWORK_XFRM static int cap_xfrm_policy_alloc_security(struct xfrm_sec_ctx **ctxp, - struct xfrm_user_sec_ctx *sec_ctx) + struct xfrm_user_sec_ctx *sec_ctx, + gfp_t gfp) { return 0; } |