summaryrefslogtreecommitdiffstats
path: root/security/apparmor/mount.c
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2019-04-05 15:34:58 +0200
committerJohn Johansen <john.johansen@canonical.com>2019-06-20 10:33:31 -0700
commit8ac2ca328ec9356f56d0dad3aa350d9600db951a (patch)
treeca39bf7b77517a20b29b0cedd9ad5864266847af /security/apparmor/mount.c
parentdf323337e507a0009d3db1ea25948d4c7f320d62 (diff)
downloadlinux-8ac2ca328ec9356f56d0dad3aa350d9600db951a.tar.bz2
apparmor: Switch to GFP_KERNEL where possible
After removing preempt_disable() from get_buffers() it is possible to replace a few GFP_ATOMIC allocations with GFP_KERNEL. Replace GFP_ATOMIC allocations with GFP_KERNEL where the context looks to bee preepmtible. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor/mount.c')
-rw-r--r--security/apparmor/mount.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
index 267a26fba14e..79379d9275d8 100644
--- a/security/apparmor/mount.c
+++ b/security/apparmor/mount.c
@@ -708,7 +708,7 @@ int aa_pivotroot(struct aa_label *label, const struct path *old_path,
error = -ENOMEM;
if (!old_buffer || !new_buffer)
goto out;
- target = fn_label_build(label, profile, GFP_ATOMIC,
+ target = fn_label_build(label, profile, GFP_KERNEL,
build_pivotroot(profile, new_path, new_buffer,
old_path, old_buffer));
if (!target) {