Commit 15ad3074 authored by Mike Rapoport's avatar Mike Rapoport Committed by Zheng Zengkai
Browse files

memblock: stop poisoning raw allocations 

mainline inclusion
from mainline-v5.15-rc1
commit 08678804
category: bugfix
bugzilla: 186414, https://gitee.com/openeuler/kernel/issues/I5K7IY
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=08678804e0b305bbbf5b756ad365373e5fe885a2

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

Functions memblock_alloc_exact_nid_raw() and memblock_alloc_try_nid_raw()
are intended for early memory allocation without overhead of zeroing the
allocated memory.  Since these functions were used to allocate the memory
map, they have ended up with addition of a call to page_init_poison() that
poisoned the allocated memory when CONFIG_PAGE_POISON was set.

Since the memory map is allocated using a dedicated memmep_alloc()
function that takes care of the poisoning, remove page poisoning from the
memblock_alloc_*_raw() functions.

Link: https://lkml.kernel.org/r/20210714123739.16493-5-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 25837227

mm/memblock.c

+4 −16
Original line number Diff line number Diff line
@@ -1501,18 +1501,12 @@ void * __init memblock_alloc_exact_nid_raw( 
			phys_addr_t min_addr, phys_addr_t max_addr,

			int nid)

{

	void *ptr;



	memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pS\n",

		     __func__, (u64)size, (u64)align, nid, &min_addr,

		     &max_addr, (void *)_RET_IP_);



	ptr = memblock_alloc_internal(size, align,

					   min_addr, max_addr, nid, true);

	if (ptr && size > 0)

		page_init_poison(ptr, size);



	return ptr;

	return memblock_alloc_internal(size, align, min_addr, max_addr, nid,

				       true);

}



/**
@@ -1539,18 +1533,12 @@ void * __init memblock_alloc_try_nid_raw( 
			phys_addr_t min_addr, phys_addr_t max_addr,

			int nid)

{

	void *ptr;



	memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pS\n",

		     __func__, (u64)size, (u64)align, nid, &min_addr,

		     &max_addr, (void *)_RET_IP_);



	ptr = memblock_alloc_internal(size, align,

					   min_addr, max_addr, nid, false);

	if (ptr && size > 0)

		page_init_poison(ptr, size);



	return ptr;

	return memblock_alloc_internal(size, align, min_addr, max_addr, nid,

				       false);

}



/**