lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

stdlib: Make abort/_Exit AS-safe (BZ 26275)

Browse Source 
The recursive lock used on abort does not synchronize with a new process
creation (either by fork-like interfaces or posix_spawn ones), nor it
is reinitialized after fork().

Also, the SIGABRT unblock before raise() shows another race condition,
where a fork or posix_spawn() call by another thread, just after the
recursive lock release and before the SIGABRT signal, might create
programs with a non-expected signal mask.  With the default option
(without POSIX_SPAWN_SETSIGDEF), the process can see SIG_DFL for
SIGABRT, where it should be SIG_IGN.

To fix the AS-safe, raise() does not change the process signal mask,
and an AS-safe lock is used if a SIGABRT is installed or the process
is blocked or ignored.  With the signal mask change removal,
there is no need to use a recursive loc.  The lock is also taken on
both _Fork() and posix_spawn(), to avoid the spawn process to see the
abort handler as SIG_DFL.

A read-write lock is used to avoid serialize _Fork and posix_spawn
execution.  Both sigaction (SIGABRT) and abort() requires to lock
as writer (since both change the disposition).

The fallback is also simplified: there is no need to use a loop of
ABORT_INSTRUCTION after _exit() (if the syscall does not terminate the
process, the system is broken).

The proposed fix changes how setjmp works on a SIGABRT handler, where
glibc does not save the signal mask.  So usage like the below will now
always abort.

  static volatile int chk_fail_ok;
  static jmp_buf chk_fail_buf;

  static void
  handler (int sig)
  {
    if (chk_fail_ok)
      {
        chk_fail_ok = 0;
        longjmp (chk_fail_buf, 1);
      }
    else
      _exit (127);
  }
  [...]
  signal (SIGABRT, handler);
  [....]
  chk_fail_ok = 1;
  if (! setjmp (chk_fail_buf))
    {
      // Something that can calls abort, like a failed fortify function.
      chk_fail_ok = 0;
      printf ("FAIL\n");
    }

Such cases will need to use sigsetjmp instead.

The _dl_start_profile calls sigaction through _profil, and to avoid
pulling abort() on loader the call is replaced with __libc_sigaction.

Checked on x86_64-linux-gnu and aarch64-linux-gnu.

Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Adhemerval Zanella
2024-10-03 15:41:10 -03:00
parent 55d33108c7
commit d40ac01cbb
20 changed files with 182 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sysdeps/generic/internal-signals.h
View File

@ -20,6 +20,7 @@
# define __INTERNAL_SIGNALS_H
#include <signal.h>
#include <internal-sigset.h>
#include <sigsetops.h>
#include <stdbool.h>
#include <stddef.h>
@ -39,10 +40,32 @@ clear_internal_signals (sigset_t *set)
{
}
typedef sigset_t internal_sigset_t;
#define internal_sigemptyset(__s) __sigemptyset (__s)
#define internal_sigfillset(__s) __sigfillset (__s)
#define internal_sigaddset(__s, __i) __sigaddset (__s, __i)
#define internal_sigprocmask(__h, __s, __o) __sigprocmask (__h, __s, __o)
static inline void
internal_signal_block_all (internal_sigset_t *oset)
{
internal_sigset_t set;
internal_sigfillset (&set);
internal_sigprocmask (SIG_BLOCK, &set, oset);
}
static inline void
internal_signal_restore_set (const internal_sigset_t *set)
{
internal_sigprocmask (SIG_SETMASK, set, NULL);
}
static inline void
internal_signal_unblock_signal (int sig)
{
internal_sigset_t set;
internal_sigemptyset (&set);
internal_sigaddset (&set, sig);
internal_sigprocmask (SIG_UNBLOCK, &set, NULL);
}
#endif /* __INTERNAL_SIGNALS_H */