apparmor: remove minimum size check for vmalloc()

This is a follow-up to commit b5b3ee6c "apparmor: no need to delay vfree()".

Since vmalloc() will do "size = PAGE_ALIGN(size);",
we don't need to check for "size >= sizeof(struct work_struct)".

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: John Johansen <john.johansen@canonical.com>

diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index fcfe0233574cb2f32197dcbe84d5170da663d779..69689922c491b8a4eeda5d96115df4a49e6a844f 100644 (file)
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -97,11 +97,6 @@ void *__aa_kvmalloc(size_t size, gfp_t flags)
        if (size <= (16*PAGE_SIZE))
                buffer = kmalloc(size, flags | GFP_NOIO | __GFP_NOWARN);
        if (!buffer) {
-               /* see kvfree for why size must be at least work_struct size
-                * when allocated via vmalloc
-                */
-               if (size < sizeof(struct work_struct))
-                       size = sizeof(struct work_struct);
                if (flags & __GFP_ZERO)
                        buffer = vzalloc(size);
                else