Commit be53526f authored by Kees Cook's avatar Kees Cook Committed by Hui Tang
Browse files

kunit/fortify: Fix mismatched kvalloc()/vfree() usage 

stable inclusion
from stable-v6.6.33
commit 7880dbf4eafe22a6a41a42e774f1122c814ed02d
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA6SEY
CVE: CVE-2024-38617

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7880dbf4eafe22a6a41a42e774f1122c814ed02d

---------------------------

[ Upstream commit 998b18072ceb0613629c256b409f4d299829c7ec ]

The kv*() family of tests were accidentally freeing with vfree() instead
of kvfree(). Use kvfree() instead.

Fixes: 9124a264 ("kunit/fortify: Validate __alloc_size attribute results")
Link: https://lore.kernel.org/r/20240425230619.work.299-kees@kernel.org


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarHui Tang <tanghui20@huawei.com>
parent 1d5af92c

lib/fortify_kunit.c

+8 −8
Original line number Diff line number Diff line
@@ -228,28 +228,28 @@ DEFINE_ALLOC_SIZE_TEST_PAIR(vmalloc) 
									\

	checker((expected_pages) * PAGE_SIZE,				\

		kvmalloc((alloc_pages) * PAGE_SIZE, gfp),		\

		vfree(p));						\

		kvfree(p));						\

	checker((expected_pages) * PAGE_SIZE,				\

		kvmalloc_node((alloc_pages) * PAGE_SIZE, gfp, NUMA_NO_NODE), \

		vfree(p));						\

		kvfree(p));						\

	checker((expected_pages) * PAGE_SIZE,				\

		kvzalloc((alloc_pages) * PAGE_SIZE, gfp),		\

		vfree(p));						\

		kvfree(p));						\

	checker((expected_pages) * PAGE_SIZE,				\

		kvzalloc_node((alloc_pages) * PAGE_SIZE, gfp, NUMA_NO_NODE), \

		vfree(p));						\

		kvfree(p));						\

	checker((expected_pages) * PAGE_SIZE,				\

		kvcalloc(1, (alloc_pages) * PAGE_SIZE, gfp),		\

		vfree(p));						\

		kvfree(p));						\

	checker((expected_pages) * PAGE_SIZE,				\

		kvcalloc((alloc_pages) * PAGE_SIZE, 1, gfp),		\

		vfree(p));						\

		kvfree(p));						\

	checker((expected_pages) * PAGE_SIZE,				\

		kvmalloc_array(1, (alloc_pages) * PAGE_SIZE, gfp),	\

		vfree(p));						\

		kvfree(p));						\

	checker((expected_pages) * PAGE_SIZE,				\

		kvmalloc_array((alloc_pages) * PAGE_SIZE, 1, gfp),	\

		vfree(p));						\

		kvfree(p));						\

									\

	prev_size = (expected_pages) * PAGE_SIZE;			\

	orig = kvmalloc(prev_size, gfp);				\