* [PATCH v3] powerpc/mm: Fix null-pointer dereference in pgtable_cache_add
@ 2023-12-04 2:32 ` Kunwu Chan
0 siblings, 0 replies; 4+ messages in thread
From: Kunwu Chan @ 2023-12-04 2:32 UTC (permalink / raw)
To: mpe, npiggin, christophe.leroy
Cc: kunwu.chan, linuxppc-dev, linux-kernel, Kunwu Chan
kasprintf() returns a pointer to dynamically allocated memory
which can be NULL upon failure. Ensure the allocation was successful
by checking the pointer validity.
Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
---
v2: Use "panic" instead of "return"
v3: Merge two "panic" to one
---
arch/powerpc/mm/init-common.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/mm/init-common.c b/arch/powerpc/mm/init-common.c
index 119ef491f797..d3a7726ecf51 100644
--- a/arch/powerpc/mm/init-common.c
+++ b/arch/powerpc/mm/init-common.c
@@ -126,7 +126,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
@@ -139,7 +139,8 @@ void pgtable_cache_add(unsigned int shift)
align = max_t(unsigned long, align, minalign);
name = kasprintf(GFP_KERNEL, "pgtable-2^%d", shift);
- new = kmem_cache_create(name, table_size, align, 0, ctor(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);
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3] powerpc/mm: Fix null-pointer dereference in pgtable_cache_add
@ 2023-12-04 2:32 ` Kunwu Chan
0 siblings, 0 replies; 4+ messages in thread
From: Kunwu Chan @ 2023-12-04 2:32 UTC (permalink / raw)
To: mpe, npiggin, christophe.leroy
Cc: linuxppc-dev, linux-kernel, Kunwu Chan, kunwu.chan
kasprintf() returns a pointer to dynamically allocated memory
which can be NULL upon failure. Ensure the allocation was successful
by checking the pointer validity.
Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Kunwu Chan <chentao@kylinos.cn>
---
v2: Use "panic" instead of "return"
v3: Merge two "panic" to one
---
arch/powerpc/mm/init-common.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/mm/init-common.c b/arch/powerpc/mm/init-common.c
index 119ef491f797..d3a7726ecf51 100644
--- a/arch/powerpc/mm/init-common.c
+++ b/arch/powerpc/mm/init-common.c
@@ -126,7 +126,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
@@ -139,7 +139,8 @@ void pgtable_cache_add(unsigned int shift)
align = max_t(unsigned long, align, minalign);
name = kasprintf(GFP_KERNEL, "pgtable-2^%d", shift);
- new = kmem_cache_create(name, table_size, align, 0, ctor(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);
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3] powerpc/mm: Fix null-pointer dereference in pgtable_cache_add
2023-12-04 2:32 ` Kunwu Chan
@ 2023-12-21 10:38 ` Michael Ellerman
-1 siblings, 0 replies; 4+ messages in thread
From: Michael Ellerman @ 2023-12-21 10:38 UTC (permalink / raw)
To: npiggin, christophe.leroy, Kunwu Chan
Cc: kunwu.chan, linuxppc-dev, linux-kernel
On Mon, 04 Dec 2023 10:32:23 +0800, Kunwu Chan wrote:
> kasprintf() returns a pointer to dynamically allocated memory
> which can be NULL upon failure. Ensure the allocation was successful
> by checking the pointer validity.
>
>
Applied to powerpc/next.
[1/1] powerpc/mm: Fix null-pointer dereference in pgtable_cache_add
https://git.kernel.org/powerpc/c/f46c8a75263f97bda13c739ba1c90aced0d3b071
cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3] powerpc/mm: Fix null-pointer dereference in pgtable_cache_add
@ 2023-12-21 10:38 ` Michael Ellerman
0 siblings, 0 replies; 4+ messages in thread
From: Michael Ellerman @ 2023-12-21 10:38 UTC (permalink / raw)
To: npiggin, christophe.leroy, Kunwu Chan
Cc: linuxppc-dev, linux-kernel, kunwu.chan
On Mon, 04 Dec 2023 10:32:23 +0800, Kunwu Chan wrote:
> kasprintf() returns a pointer to dynamically allocated memory
> which can be NULL upon failure. Ensure the allocation was successful
> by checking the pointer validity.
>
>
Applied to powerpc/next.
[1/1] powerpc/mm: Fix null-pointer dereference in pgtable_cache_add
https://git.kernel.org/powerpc/c/f46c8a75263f97bda13c739ba1c90aced0d3b071
cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-21 10:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-04 2:32 [PATCH v3] powerpc/mm: Fix null-pointer dereference in pgtable_cache_add Kunwu Chan
2023-12-04 2:32 ` Kunwu Chan
2023-12-21 10:38 ` Michael Ellerman
2023-12-21 10:38 ` Michael Ellerman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.