Skip to content

Commit 134475a

Browse files
t-8chchenhuacai
authored andcommitted
LoongArch: Don't crash in stack_top() for tasks without vDSO
Not all tasks have a vDSO mapped, for example kthreads never do. If such a task ever ends up calling stack_top(), it will derefence the NULL vdso pointer and crash. This can for example happen when using kunit: [<9000000000203874>] stack_top+0x58/0xa8 [<90000000002956cc>] arch_pick_mmap_layout+0x164/0x220 [<90000000003c284c>] kunit_vm_mmap_init+0x108/0x12c [<90000000003c1fbc>] __kunit_add_resource+0x38/0x8c [<90000000003c2704>] kunit_vm_mmap+0x88/0xc8 [<9000000000410b14>] usercopy_test_init+0xbc/0x25c [<90000000003c1db4>] kunit_try_run_case+0x5c/0x184 [<90000000003c3d54>] kunit_generic_run_threadfn_adapter+0x24/0x48 [<900000000022e4bc>] kthread+0xc8/0xd4 [<9000000000200ce8>] ret_from_kernel_thread+0xc/0xa4 Fixes: 803b0fc ("LoongArch: Add process management") Signed-off-by: Thomas Weißschuh <[email protected]> Signed-off-by: Huacai Chen <[email protected]>
1 parent 2ed119a commit 134475a

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

arch/loongarch/kernel/process.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,15 @@ unsigned long stack_top(void)
293293
{
294294
unsigned long top = TASK_SIZE & PAGE_MASK;
295295

296-
/* Space for the VDSO & data page */
297-
top -= PAGE_ALIGN(current->thread.vdso->size);
298-
top -= VVAR_SIZE;
299-
300-
/* Space to randomize the VDSO base */
301-
if (current->flags & PF_RANDOMIZE)
302-
top -= VDSO_RANDOMIZE_SIZE;
296+
if (current->thread.vdso) {
297+
/* Space for the VDSO & data page */
298+
top -= PAGE_ALIGN(current->thread.vdso->size);
299+
top -= VVAR_SIZE;
300+
301+
/* Space to randomize the VDSO base */
302+
if (current->flags & PF_RANDOMIZE)
303+
top -= VDSO_RANDOMIZE_SIZE;
304+
}
303305

304306
return top;
305307
}

0 commit comments

Comments
 (0)