diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-03-16 12:48:11 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-03-27 02:41:03 +0000 |
| commit | bd8a48b71de28098f662ce8dfb919ea4eff28103 (patch) | |
| tree | 5a42b6ba570ebfad73fc6536bf2e149f03bc7de8 | |
| parent | 984cbc9c6686f399cb4ec5bd8fae5ff8ec2fa9a8 (diff) | |
| download | linux-stable-bd8a48b71de28098f662ce8dfb919ea4eff28103.tar.gz linux-stable-bd8a48b71de28098f662ce8dfb919ea4eff28103.tar.bz2 linux-stable-bd8a48b71de28098f662ce8dfb919ea4eff28103.zip | |
selinux: use GFP_ATOMIC under spin_lock
commit 4502403dcf8f5c76abd4dbab8726c8e4ecb5cd34 upstream.
The call tree here is:
sk_clone_lock() <- takes bh_lock_sock(newsk);
xfrm_sk_clone_policy()
__xfrm_sk_clone_policy()
clone_policy() <- uses GFP_ATOMIC for allocations
security_xfrm_policy_clone()
security_ops->xfrm_policy_clone_security()
selinux_xfrm_policy_clone()
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | security/selinux/xfrm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/xfrm.c b/security/selinux/xfrm.c index 48665ecd1197..8ab295154517 100644 --- a/security/selinux/xfrm.c +++ b/security/selinux/xfrm.c @@ -310,7 +310,7 @@ int selinux_xfrm_policy_clone(struct xfrm_sec_ctx *old_ctx, if (old_ctx) { new_ctx = kmalloc(sizeof(*old_ctx) + old_ctx->ctx_len, - GFP_KERNEL); + GFP_ATOMIC); if (!new_ctx) return -ENOMEM; |