diff options
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/security/security.c b/security/security.c index 4a6265ab3cc2..2e250c7028eb 100644 --- a/security/security.c +++ b/security/security.c | |||
@@ -1060,26 +1060,27 @@ void security_inet_conn_established(struct sock *sk, | |||
1060 | 1060 | ||
1061 | #ifdef CONFIG_SECURITY_NETWORK_XFRM | 1061 | #ifdef CONFIG_SECURITY_NETWORK_XFRM |
1062 | 1062 | ||
1063 | int security_xfrm_policy_alloc(struct xfrm_policy *xp, struct xfrm_user_sec_ctx *sec_ctx) | 1063 | int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *sec_ctx) |
1064 | { | 1064 | { |
1065 | return security_ops->xfrm_policy_alloc_security(xp, sec_ctx); | 1065 | return security_ops->xfrm_policy_alloc_security(ctxp, sec_ctx); |
1066 | } | 1066 | } |
1067 | EXPORT_SYMBOL(security_xfrm_policy_alloc); | 1067 | EXPORT_SYMBOL(security_xfrm_policy_alloc); |
1068 | 1068 | ||
1069 | int security_xfrm_policy_clone(struct xfrm_policy *old, struct xfrm_policy *new) | 1069 | int security_xfrm_policy_clone(struct xfrm_sec_ctx *old_ctx, |
1070 | struct xfrm_sec_ctx **new_ctxp) | ||
1070 | { | 1071 | { |
1071 | return security_ops->xfrm_policy_clone_security(old, new); | 1072 | return security_ops->xfrm_policy_clone_security(old_ctx, new_ctxp); |
1072 | } | 1073 | } |
1073 | 1074 | ||
1074 | void security_xfrm_policy_free(struct xfrm_policy *xp) | 1075 | void security_xfrm_policy_free(struct xfrm_sec_ctx *ctx) |
1075 | { | 1076 | { |
1076 | security_ops->xfrm_policy_free_security(xp); | 1077 | security_ops->xfrm_policy_free_security(ctx); |
1077 | } | 1078 | } |
1078 | EXPORT_SYMBOL(security_xfrm_policy_free); | 1079 | EXPORT_SYMBOL(security_xfrm_policy_free); |
1079 | 1080 | ||
1080 | int security_xfrm_policy_delete(struct xfrm_policy *xp) | 1081 | int security_xfrm_policy_delete(struct xfrm_sec_ctx *ctx) |
1081 | { | 1082 | { |
1082 | return security_ops->xfrm_policy_delete_security(xp); | 1083 | return security_ops->xfrm_policy_delete_security(ctx); |
1083 | } | 1084 | } |
1084 | 1085 | ||
1085 | int security_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx) | 1086 | int security_xfrm_state_alloc(struct xfrm_state *x, struct xfrm_user_sec_ctx *sec_ctx) |
@@ -1111,9 +1112,9 @@ void security_xfrm_state_free(struct xfrm_state *x) | |||
1111 | security_ops->xfrm_state_free_security(x); | 1112 | security_ops->xfrm_state_free_security(x); |
1112 | } | 1113 | } |
1113 | 1114 | ||
1114 | int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 fl_secid, u8 dir) | 1115 | int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir) |
1115 | { | 1116 | { |
1116 | return security_ops->xfrm_policy_lookup(xp, fl_secid, dir); | 1117 | return security_ops->xfrm_policy_lookup(ctx, fl_secid, dir); |
1117 | } | 1118 | } |
1118 | 1119 | ||
1119 | int security_xfrm_state_pol_flow_match(struct xfrm_state *x, | 1120 | int security_xfrm_state_pol_flow_match(struct xfrm_state *x, |