Message-ID: <d70a92e6-95db-469b-841c-56f4f3564843@xen0n.name>
Date:   Fri, 9 Sep 2022 00:17:05 +0800
From:   WANG Xuerui <kernel@...0n.name>
To:     Mao Bibo <maobibo@...ngson.cn>,
        Huacai Chen <chenhuacai@...nel.org>,
        Arnd Bergmann <arnd@...db.de>,
        Christian Brauner <brauner@...nel.org>
Cc:     Jiaxun Yang <jiaxun.yang@...goat.com>, loongarch@...ts.linux.dev,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3] LoongArch: Add safer signal handler for TLS access

Hi,

On 9/2/22 17:59, Mao Bibo wrote:
> LoongArch uses general purpose register R2 as thread pointer(TP)
> register, signal hanlder also uses TP register to access variables
> in TLS area, such as errno and variable in TLS.
>
> If GPR R2 is modified with wrong value, signal handler still uses
> the wrong TP register, so signal hanlder is insafe to access TLS
> variable.
>
> This patch adds one arch specific syscall set_thread_area, and
> restore previoud TP value before signal handler, so that signal
> handler is safe to access TLS variable.
>
> It passes to run with the following test case.
> =======8<======
>   #define _GNU_SOURCE
>   #include <stdio.h>
>   #include <stdlib.h>
>   #include <unistd.h>
>   #include <string.h>
>   #include <sys/syscall.h>
>   #include <sys/types.h>
>   #include <signal.h>
>   #include <pthread.h>
>   #include <asm/ucontext.h>
>   #include <asm/sigcontext.h>
>
>   #define ILL_INSN ".word 0x000001f0"
> static inline long test_sigill(unsigned long fid)
> {
>          register long ret __asm__("$r4");
>          register unsigned long fun __asm__("$r4") = fid;
>
>          __asm__ __volatile__("move $r2, $r0 \r\n");
>          __asm__ __volatile__(
>                          ILL_INSN
>                          : "=r" (ret)
>                          : "r" (fun)
>                          : "memory"
>                          );
>
>          return ret;
> }
>
> static void set_sigill_handler(void (*fn) (int, siginfo_t *, void *))
> {
>          struct sigaction sa;
>          memset(&sa, 0, sizeof(struct sigaction));
>
>          sa.sa_sigaction = fn;
>          sa.sa_flags = SA_SIGINFO;
>          sigemptyset(&sa.sa_mask);
>          if (sigaction(SIGILL, &sa, 0) != 0) {
>                  perror("sigaction");
>          }
> }
>
> void catch_sig(int sig, siginfo_t *si, void *vuc)
> {
>          struct ucontext *uc = vuc;
>          register unsigned long tls  __asm__("$r2");
>
>          uc->uc_mcontext.sc_pc +=4;
>          uc->uc_mcontext.sc_regs[2] = tls;
>          printf("catched signal %d\n", sig);
> }
>
> void *print_message_function( void *ptr )
> {
>          char *message;
>          message = (char *) ptr;
>          printf("%s \n", message);
>          test_sigill(1);
> }
>
> void pthread_test(void)
> {
>          pthread_t thread1, thread2;
>          char *message1 = "Thread 1";
>          char *message2 = "Thread 2";
>          int  iret1, iret2;
>
>          iret1 = pthread_create( &thread1, NULL, print_message_function,
> 				(void*) message1);
>          iret2 = pthread_create( &thread2, NULL, print_message_function,
> 				(void*) message2);
>          pthread_join( thread1, NULL);
>          pthread_join( thread2, NULL);
>          printf("Thread 1 returns: %d\n",iret1);
>          printf("Thread 2 returns: %d\n",iret2);
>          exit(0);
> }
>
> void exec_test(void) {
>          test_sigill(1);
> }
>
> void main() {
>          register unsigned long tls  __asm__("$r2");
>          int val;
>
>          val = syscall(244, tls);
>          set_sigill_handler(&catch_sig);
>          pthread_test();
>          //exec_test();
>          return;
> }
> =======8<======
>
> Signed-off-by: Bibo Mao <maobibo@...ngson.cn>
> ---
> v2->v3:
>   - Use current_thread_info rather than task_thread_info(current)
> v1->v2:
>   - Clear TP value in clone function if CLONE_SETTLS is not set
> ---
>   arch/loongarch/include/asm/unistd.h      |  1 +
>   arch/loongarch/include/uapi/asm/unistd.h |  2 ++
>   arch/loongarch/kernel/process.c          | 10 +++++++++-
>   arch/loongarch/kernel/signal.c           |  5 +++++
>   arch/loongarch/kernel/syscall.c          |  9 +++++++++
>   5 files changed, 26 insertions(+), 1 deletion(-)

So here we're trying to accommodate for ABI violations from user-mode 
programs, no matter whether they come from fuzzing, or any other black 
magic; but being user-space, theoretically set_thread_area could also be 
fuzzed, and this "additional" layer of defense then breaks down. And if 
this theoretical case is deemed uninteresting, remember the case you're 
demonstrating is also found by fuzzing and not found in normal working 
user programs, then the whole scenario should be theoretical and 
uninteresting as well...

BTW I've also thrown this problem into a riscv discussion group, and 
they pointed out that e.g. sigaltstack is already available for 
guaranteeing at least some working state when a signal comes. And riscv 
also doesn't have set_thread_area which is most likely why loongarch 
isn't getting one; further, looking at manpages of 
{get,set}_thread_area, it may be the case that both riscv and loongarch 
have the TP in user-visible ISA state, so a syscall is not needed for 
manipulating it anyway. Again it's equally easy to mess the hidden state 
of set_thread_area as $tp itself. Or put it differently, if 
set_thread_area is necessary/good for loongarch, you should probably add 
it to riscv as well -- both will benefit.

-- 
WANG "xen0n" Xuerui

Linux/LoongArch mailing list: https://lore.kernel.org/loongarch/

Powered by blists - more mailing lists