Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe4ac28 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by John Johansen
Browse files

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: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
parent 9548906b

security/apparmor/lib.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -97,11 +97,6 @@ void *__aa_kvmalloc(size_t size, gfp_t flags) 
	if (size <= (16*PAGE_SIZE))

	if (size <= (16*PAGE_SIZE))

		buffer = kmalloc(size, flags | GFP_NOIO | __GFP_NOWARN);

		buffer = kmalloc(size, flags | GFP_NOIO | __GFP_NOWARN);

	if (!buffer) {

	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)

		if (flags & __GFP_ZERO)

			buffer = vzalloc(size);

			buffer = vzalloc(size);

		else

		else