diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-18 17:42:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-18 17:42:33 +0100 |
| commit | 72c2dfdefa42c747c8e61f3d3ebfafc8e8d5762f (patch) | |
| tree | 36ffd7b181a7b72fe02015014086001e440a043d /security/selinux/include/xfrm.h | |
| parent | net: cpsw: do not register cpts twice (diff) | |
| parent | selinux: add gfp argument to security_xfrm_policy_alloc and fix callers (diff) | |
| download | linux-72c2dfdefa42c747c8e61f3d3ebfafc8e8d5762f.tar.xz linux-72c2dfdefa42c747c8e61f3d3ebfafc8e8d5762f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
1) Fix a sleep in atomic when pfkey_sadb2xfrm_user_sec_ctx()
is called from pfkey_compile_policy().
Fix from Nikolay Aleksandrov.
2) security_xfrm_policy_alloc() can be called in process and atomic
context. Add an argument to let the callers choose the appropriate
way. Fix from Nikolay Aleksandrov.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/selinux/include/xfrm.h')
| -rw-r--r-- | security/selinux/include/xfrm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h index 48c3cc94c168..9f0584710c85 100644 --- a/security/selinux/include/xfrm.h +++ b/security/selinux/include/xfrm.h @@ -10,7 +10,8 @@ #include <net/flow.h> int selinux_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp, - struct xfrm_user_sec_ctx *uctx); + struct xfrm_user_sec_ctx *uctx, + gfp_t gfp); int selinux_xfrm_policy_clone(struct xfrm_sec_ctx *old_ctx, struct xfrm_sec_ctx **new_ctxp); void selinux_xfrm_policy_free(struct xfrm_sec_ctx *ctx); |