apparmor: use passed in gfp flags in aa_alloc_null()

These allocations should use the gfp flags from the caller instead of
GFP_KERNEL.  But from what I can see, all the callers pass in GFP_KERNEL
so this does not affect runtime.

Fixes: e31dd6e412f7 ("apparmor: fix: kzalloc perms tables for shared dfas")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: John Johansen <john.johansen@canonical.com>

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index b38f7b2a5e1d5dde906a973a15b030e4aad1a894..715fe1b66d12337ef038a54ced2f4228fe01f973 100644 (file)
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -589,12 +589,12 @@ struct aa_profile *aa_alloc_null(struct aa_profile *parent, const char *name,
        profile->label.flags |= FLAG_NULL;
        rules = list_first_entry(&profile->rules, typeof(*rules), list);
        rules->file.dfa = aa_get_dfa(nulldfa);
-       rules->file.perms = kcalloc(2, sizeof(struct aa_perms), GFP_KERNEL);
+       rules->file.perms = kcalloc(2, sizeof(struct aa_perms), gfp);
        if (!rules->file.perms)
                goto fail;
        rules->file.size = 2;
        rules->policy.dfa = aa_get_dfa(nulldfa);
-       rules->policy.perms = kcalloc(2, sizeof(struct aa_perms), GFP_KERNEL);
+       rules->policy.perms = kcalloc(2, sizeof(struct aa_perms), gfp);
        if (!rules->policy.perms)
                goto fail;
        rules->policy.size = 2;