diff options
| author |   Haoxiang Li <haoxiang_li2024@163.com> | 2025-02-18 00:00:17 +0800 |
|---|---|---|
| committer |   Andrew Morton <akpm@linux-foundation.org> | 2025-03-05 21:36:12 -0800 |
| commit | 7277dd0a0ba4f8259f7abe37c4b7280fbfc2a182 (patch) | |
| tree | edfdc40327100ded546e4eac5c92b1763360340e | |
| parent | selftests/damon/damos_quota_goal: handle minimum quota that cannot be further reduced (diff) | |
| download | wireguard-linux-7277dd0a0ba4f8259f7abe37c4b7280fbfc2a182.tar.xz wireguard-linux-7277dd0a0ba4f8259f7abe37c4b7280fbfc2a182.zip | |
m68k: sun3: add check for __pgd_alloc()
Add check for the return value of __pgd_alloc() in pgd_alloc() to prevent
null pointer dereference.
Link: https://lkml.kernel.org/r/20250217160017.2375536-1-haoxiang_li2024@163.com
Fixes: a9b3c355c2e6 ("asm-generic: pgalloc: provide generic __pgd_{alloc,free}")
Signed-off-by: Haoxiang Li <haoxiang_li2024@163.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: Sam Creasey <sammy@sammy.net>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | arch/m68k/include/asm/sun3_pgalloc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h index f1ae4ed890db..80afc3a18724 100644 --- a/arch/m68k/include/asm/sun3_pgalloc.h +++ b/arch/m68k/include/asm/sun3_pgalloc.h @@ -44,8 +44,10 @@ static inline pgd_t * pgd_alloc(struct mm_struct *mm) pgd_t *new_pgd; new_pgd = __pgd_alloc(mm, 0); - memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE); - memset(new_pgd, 0, (PAGE_OFFSET >> PGDIR_SHIFT)); + if (likely(new_pgd != NULL)) { + memcpy(new_pgd, swapper_pg_dir, PAGE_SIZE); + memset(new_pgd, 0, (PAGE_OFFSET >> PGDIR_SHIFT)); + } return new_pgd; } |