Skip to content

Commit 6d64095

Browse files
benzearichardweinberger
authored andcommitted
um: Do not use printk in userspace trampoline
The trampoline is running in a cloned process. It is not safe to use printk for error printing there. Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net> Signed-off-by: Richard Weinberger <richard@nod.at>
1 parent 139e6e8 commit 6d64095

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

arch/um/os-Linux/skas/process.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ static int userspace_tramp(void *stack)
221221
addr = mmap64((void *) STUB_CODE, UM_KERN_PAGE_SIZE,
222222
PROT_EXEC, MAP_FIXED | MAP_PRIVATE, fd, offset);
223223
if (addr == MAP_FAILED) {
224-
printk(UM_KERN_ERR "mapping mmap stub at 0x%lx failed, errno = %d\n",
225-
STUB_CODE, errno);
224+
os_info("mapping mmap stub at 0x%lx failed, errno = %d\n",
225+
STUB_CODE, errno);
226226
exit(1);
227227
}
228228

@@ -231,8 +231,8 @@ static int userspace_tramp(void *stack)
231231
STUB_DATA_PAGES * UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE,
232232
MAP_FIXED | MAP_SHARED, fd, offset);
233233
if (addr == MAP_FAILED) {
234-
printk(UM_KERN_ERR "mapping segfault stack at 0x%lx failed, errno = %d\n",
235-
STUB_DATA, errno);
234+
os_info("mapping segfault stack at 0x%lx failed, errno = %d\n",
235+
STUB_DATA, errno);
236236
exit(1);
237237
}
238238

@@ -242,8 +242,8 @@ static int userspace_tramp(void *stack)
242242
sa.sa_sigaction = (void *) segv_handler;
243243
sa.sa_restorer = NULL;
244244
if (sigaction(SIGSEGV, &sa, NULL) < 0) {
245-
printk(UM_KERN_ERR "%s - setting SIGSEGV handler failed - errno = %d\n",
246-
__func__, errno);
245+
os_info("%s - setting SIGSEGV handler failed - errno = %d\n",
246+
__func__, errno);
247247
exit(1);
248248
}
249249

0 commit comments

Comments
 (0)