diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-06-05 10:17:46 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-06-05 10:17:46 +0000 |
| commit | 7553131847151d04d58a02300673f13d73861cbb (patch) | |
| tree | 59efadeab12ec41f6ee18a2858e63be9a45b4c22 /hurd | |
| parent | 8951dd0b148c260afde95ac7179e9067276ed6d7 (diff) | |
| download | glibc-7553131847151d04d58a02300673f13d73861cbb.zip glibc-7553131847151d04d58a02300673f13d73861cbb.tar.gz glibc-7553131847151d04d58a02300673f13d73861cbb.tar.bz2 | |
Fix struct sigaltstack namespace (bug 21517).
glibc defines the stack_t type with the tag struct sigaltstack. This
is not permitted by POSIX; sigaltstack is only reserved with file
scope in the namespace of ordinary identifiers, not the tag namespace,
and in the case where stack_t is obtained from ucontext.h rather than
signal.h, it's not reserved with file scope at all.
This patch removes the tag accordingly and updates uses in glibc of
struct sigaltstack. This is similar to the removal of the "struct
siginfo" tag a few years ago: C++ name mangling changes are an
unavoidable consequence. A NEWS item is added to note the changed
mangling. There is inevitably some risk of breaking builds of
anything that relies on the struct sigaltstack name (though the first
few hits I looked at from codesearch.debian.net generally seemed to
involve code that could use the stack_t name conditionally, so
depending on how they determine the conditionals they may work with
glibc not defining the struct tag anyway).
Tested for x86_64 and x86, and with build-many-glibcs.py.
[BZ #21517]
* bits/types/stack_t.h (stack_t): Remove struct tag.
* sysdeps/unix/sysv/linux/bits/types/stack_t.h (stack_t):
Likewise.
* sysdeps/unix/sysv/linux/mips/bits/types/stack_t.h (stack_t):
Likewise.
* debug/segfault.c (install_handler): Use stack_t instead of
struct sigaltstack.
* hurd/hurd/signal.h (struct hurd_sigstate): Likewise.
* hurd/trampoline.c (_hurd_setup_sighandler): Likewise.
* include/signal.h (__sigaltstack): Likwise.
* signal/sigaltstack.c (__sigaltstack): Likewise.
* signal/signal.h (sigaltstack): Likewise.
* sysdeps/mach/hurd/i386/signal-defines.sym
(SIGALTSTACK__SS_SP__OFFSET): Likewise.
(SIGALTSTACK__SS_SIZE__OFFSET): Likewise.
(SIGALTSTACK__SS_FLAGS__OFFSET): Likewise.
* sysdeps/mach/hurd/sigaltstack.c (__sigaltstack): Likewise.
* sysdeps/mach/hurd/sigstack.c (sigstack): Likewise.
* sysdeps/unix/sysv/linux/alpha/sys/procfs.h (struct
elf_prstatus): Likewise.
* sysdeps/unix/sysv/linux/hppa/____longjmp_chk.c (CHECK_SP):
Likewise.
* sysdeps/unix/sysv/linux/ia64/sys/procfs.h (struct elf_prstatus):
Likewise.
* sysdeps/unix/sysv/linux/m68k/____longjmp_chk.c (CHECK_SP):
Likewise.
* sysdeps/unix/sysv/linux/powerpc/sys/procfs.h (struct
elf_prstatus): Likewise.
* sysdeps/unix/sysv/linux/sh/sys/procfs.h (struct elf_prstatus):
Likewise.
* sysdeps/unix/sysv/linux/sys/procfs.h (struct elf_prstatus):
Likewise.
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/hurd/signal.h | 2 | ||||
| -rw-r--r-- | hurd/trampoline.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index f899e81..e03d53e 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -70,7 +70,7 @@ struct hurd_sigstate sigset_t blocked; /* What signals are blocked. */ sigset_t pending; /* Pending signals, possibly blocked. */ struct sigaction actions[NSIG]; - struct sigaltstack sigaltstack; + stack_t sigaltstack; /* Chain of thread-local signal preemptors; see <hurd/sigpreempt.h>. Each element of this chain is in local stack storage, and the chain diff --git a/hurd/trampoline.c b/hurd/trampoline.c index 8216e22..e506fd8 100644 --- a/hurd/trampoline.c +++ b/hurd/trampoline.c @@ -28,7 +28,7 @@ struct sigcontext * _hurd_setup_sighandler (int flags, __sighandler_t handler, - struct sigaltstack *sigaltstack, + stack_t *sigaltstack, int signo, int sigcode, void *state) { |