diff options
| author |   James Morris <james.l.morris@oracle.com> | 2013-10-22 22:26:41 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-10-22 22:26:41 +1100 |
| commit | 6f799c97f37fc0ee2c9c427fa0dada637394886c (patch) | |
| tree | 1953a953770b8047a95ef4d431bb693433922043 /security/capability.c | |
| parent | X.509: remove possible code fragility: enumeration values not handled (diff) | |
| parent | selinux: correct locking in selinux_netlbl_socket_connect) (diff) | |
| download | linux-dev-6f799c97f37fc0ee2c9c427fa0dada637394886c.tar.xz linux-dev-6f799c97f37fc0ee2c9c427fa0dada637394886c.zip | |
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next
Diffstat (limited to 'security/capability.c')
| -rw-r--r-- | security/capability.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/security/capability.c b/security/capability.c index dbeb9bc27b24..8b4f24ae4338 100644 --- a/security/capability.c +++ b/security/capability.c @@ -777,9 +777,15 @@ static int cap_xfrm_policy_delete_security(struct xfrm_sec_ctx *ctx) return 0; } -static int cap_xfrm_state_alloc_security(struct xfrm_state *x, - struct xfrm_user_sec_ctx *sec_ctx, - u32 secid) +static int cap_xfrm_state_alloc(struct xfrm_state *x, + struct xfrm_user_sec_ctx *sec_ctx) +{ + return 0; +} + +static int cap_xfrm_state_alloc_acquire(struct xfrm_state *x, + struct xfrm_sec_ctx *polsec, + u32 secid) { return 0; } @@ -1101,7 +1107,8 @@ void __init security_fixup_ops(struct security_operations *ops) set_to_cap_if_null(ops, xfrm_policy_clone_security); set_to_cap_if_null(ops, xfrm_policy_free_security); set_to_cap_if_null(ops, xfrm_policy_delete_security); - set_to_cap_if_null(ops, xfrm_state_alloc_security); + set_to_cap_if_null(ops, xfrm_state_alloc); + set_to_cap_if_null(ops, xfrm_state_alloc_acquire); set_to_cap_if_null(ops, xfrm_state_free_security); set_to_cap_if_null(ops, xfrm_state_delete_security); set_to_cap_if_null(ops, xfrm_policy_lookup); |