Unverified Commit f88ae203 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5222 powerpc/mm: Fix null-pointer dereference in pgtable_cache_add 

Merge Pull Request from: @ci-robot 
 
PR sync from: Peng Zhang <zhangpeng362@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YFPZEZXT3Q2NAP566YHFU6RKNBGTDEF4/ 
 
https://gitee.com/src-openeuler/kernel/issues/I96GP1 
 
Link:https://gitee.com/openeuler/kernel/pulls/5222

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 6c815e29 053b5f8d

arch/powerpc/mm/init-common.c

+3 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void pgtable_cache_add(unsigned int shift) 
	 * as to leave enough 0 bits in the address to contain it. */

	unsigned long minalign = max(MAX_PGTABLE_INDEX_SIZE + 1,

				     HUGEPD_SHIFT_MASK + 1);

	struct kmem_cache *new;

	struct kmem_cache *new = NULL;



	/* It would be nice if this was a BUILD_BUG_ON(), but at the

	 * moment, gcc doesn't seem to recognize is_power_of_2 as a
@@ -124,6 +124,7 @@ void pgtable_cache_add(unsigned int shift) 


	align = max_t(unsigned long, align, minalign);

	name = kasprintf(GFP_KERNEL, "pgtable-2^%d", shift);

	if (name)

		new = kmem_cache_create(name, table_size, align, 0, ctor(shift));

	if (!new)

		panic("Could not allocate pgtable cache for order %d", shift);