]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
sandbox: unblock signal before calling execv()
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>
Fri, 2 Sep 2022 00:32:25 +0000 (02:32 +0200)
committerSimon Glass <sjg@chromium.org>
Sun, 25 Sep 2022 14:30:05 +0000 (08:30 -0600)
The following faulty behavior was observed. The sandbox configured with
CONFIG_SANDBOX_CRASH_RESET=y was invoked with

    ./u-boot -T -S

After executing `exception undefined' the sandbox reboots.
When executing `exception undefined' the sandbox exits with SIGSEGV.

The expected behavior is that the sandbox should reboot again.

If we are relaunching the sandbox in a signal handler, we have to unblock
the respective signal before calling execv(). See signal(7) man-page.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
arch/sandbox/cpu/os.c

index 01845e388d353b9b95bc7f9521e2bccac15e8f96..d6170adaf5e8e92a0975ca364a9cad1300cec144 100644 (file)
@@ -1017,8 +1017,24 @@ void *os_find_text_base(void)
        return base;
 }
 
+/**
+ * os_unblock_signals() - unblock all signals
+ *
+ * If we are relaunching the sandbox in a signal handler, we have to unblock
+ * the respective signal before calling execv(). See signal(7) man-page.
+ */
+static void os_unblock_signals(void)
+{
+       sigset_t sigs;
+
+       sigfillset(&sigs);
+       sigprocmask(SIG_UNBLOCK, &sigs, NULL);
+}
+
 void os_relaunch(char *argv[])
 {
+       os_unblock_signals();
+
        execv(argv[0], argv);
        os_exit(1);
 }