OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Joseph Myers 2017-06-05 10:17:46 +00:00
parent 8951dd0b14
commit 7553131847
21 changed files with 64 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ChangeLog
View File

@ -1,3 +1,39 @@
2017-06-05 Joseph Myers <joseph@codesourcery.com>
[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.
2017-06-04 Zack Weinberg <zackw@panix.com>
* sysdeps/gnu/errlist.c: Regenerate.

3
NEWS
View File

@ -77,6 +77,9 @@ Version 2.26
compat implementation will be used (which refuses all flags and routes it
to preadv or pwritev).
* The stack_t type no longer has the name struct sigaltstack. This changes
the C++ name mangling for interfaces involving this type.
Security related changes:
* The DNS stub resolver limits the advertised UDP buffer size to 1200 bytes,

2
bits/types/stack_t.h
View File

@ -23,7 +23,7 @@
#include <stddef.h>
/* Structure describing a signal stack. */
typedef struct sigaltstack
typedef struct
{
void *ss_sp;
size_t ss_size;

2
debug/segfault.c
View File

@ -156,7 +156,7 @@ install_handler (void)
if (getenv ("SEGFAULT_USE_ALTSTACK") != 0)
{
void *stack_mem = malloc (2 * SIGSTKSZ);
struct sigaltstack ss;
stack_t ss;
if (stack_mem != NULL)
{

2
hurd/hurd/signal.h
View File

@ -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

2
hurd/trampoline.c
View File

@ -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)
{

4
include/signal.h
View File

@ -41,8 +41,8 @@ extern int __sigqueue (__pid_t __pid, int __sig,
#ifdef __USE_MISC
extern int __sigreturn (struct sigcontext *__scp);
#endif
extern int __sigaltstack (const struct sigaltstack *__ss,
struct sigaltstack *__oss);
extern int __sigaltstack (const stack_t *__ss,
stack_t *__oss);
extern int __libc_sigaction (int sig, const struct sigaction *act,
struct sigaction *oact);
libc_hidden_proto (__libc_sigaction)

2
signal/sigaltstack.c
View File

@ -21,7 +21,7 @@
/* Run signals handlers on the stack specified by SS (if not NULL).
If OSS is not NULL, it is filled in with the old signal stack status. */
int
sigaltstack (const struct sigaltstack *ss, struct sigaltstack *oss)
sigaltstack (const stack_t *ss, stack_t *oss)
{
__set_errno (ENOSYS);
return -1;

4
signal/signal.h
View File

@ -309,8 +309,8 @@ extern int siginterrupt (int __sig, int __interrupt) __THROW;
/* Alternate signal handler stack interface.
This interface should always be preferred over `sigstack'. */
extern int sigaltstack (const struct sigaltstack *__restrict __ss,
struct sigaltstack *__restrict __oss) __THROW;
extern int sigaltstack (const stack_t *__restrict __ss,
stack_t *__restrict __oss) __THROW;
#endif /* Use POSIX.1-2008 or X/Open Unix. */

6
sysdeps/mach/hurd/i386/signal-defines.sym
View File

@ -5,6 +5,6 @@
HURD_SIGSTATE__SIGALTSTACK__OFFSET offsetof(struct hurd_sigstate, sigaltstack)
SIGALTSTACK__SS_SP__OFFSET offsetof(struct sigaltstack, ss_sp)
SIGALTSTACK__SS_SIZE__OFFSET offsetof(struct sigaltstack, ss_size)
SIGALTSTACK__SS_FLAGS__OFFSET offsetof(struct sigaltstack, ss_flags)
SIGALTSTACK__SS_SP__OFFSET offsetof(stack_t, ss_sp)
SIGALTSTACK__SS_SIZE__OFFSET offsetof(stack_t, ss_size)
SIGALTSTACK__SS_FLAGS__OFFSET offsetof(stack_t, ss_flags)

6
sysdeps/mach/hurd/sigaltstack.c
View File

@ -22,16 +22,16 @@
/* Run signals handlers on the stack specified by SS (if not NULL).
If OSS is not NULL, it is filled in with the old signal stack status. */
int
__sigaltstack (const struct sigaltstack *argss, struct sigaltstack *oss)
__sigaltstack (const stack_t *argss, stack_t *oss)
{
struct hurd_sigstate *s;
struct sigaltstack ss, old;
stack_t ss, old;
/* Fault before taking any locks. */
if (argss != NULL)
ss = *argss;
if (oss != NULL)
*(volatile struct sigaltstack *) oss = *oss;
*(volatile stack_t *) oss = *oss;
s = _hurd_self_sigstate ();
__spin_lock (&s->lock);

2
sysdeps/mach/hurd/sigstack.c
View File

@ -24,7 +24,7 @@
int
sigstack (struct sigstack *ss, struct sigstack *oss)
{
struct sigaltstack as, oas;
stack_t as, oas;
as.ss_sp = ss->ss_sp;
as.ss_size = 0;

2
sysdeps/unix/sysv/linux/alpha/sys/procfs.h
View File

@ -71,7 +71,7 @@ struct elf_prstatus
unsigned long int pr_sigpend; /* Set of pending signals. */
unsigned long int pr_sighold; /* Set of held signals. */
#if 0
struct sigaltstack pr_altstack; /* Alternate stack info. */
stack_t pr_altstack; /* Alternate stack info. */
struct sigaction pr_action; /* Signal action for current sig. */
#endif
__pid_t pr_pid;

2
sysdeps/unix/sysv/linux/bits/types/stack_t.h
View File

@ -23,7 +23,7 @@
#include <stddef.h>
/* Structure describing a signal stack. */
typedef struct sigaltstack
typedef struct
{
void *ss_sp;
int ss_flags;

2
sysdeps/unix/sysv/linux/hppa/____longjmp_chk.c
View File

@ -27,7 +27,7 @@
destroyed must all have stack values higher than ours. */ \
if ((unsigned long) (sp) > this_sp) \
{ \
struct sigaltstack oss; \
stack_t oss; \
INTERNAL_SYSCALL_DECL (err); \
int result = INTERNAL_SYSCALL (sigaltstack, err, 2, NULL, &oss);\
/* If we aren't using an alternate stack then we have already \

2
sysdeps/unix/sysv/linux/ia64/sys/procfs.h
View File

@ -73,7 +73,7 @@ struct elf_prstatus
unsigned long int pr_sigpend; /* Set of pending signals. */
unsigned long int pr_sighold; /* Set of held signals. */
#if 0
struct sigaltstack pr_altstack; /* Alternate stack info. */
stack_t pr_altstack; /* Alternate stack info. */
struct sigaction pr_action; /* Signal action for current sig. */
#endif
__pid_t pr_pid;

2
sysdeps/unix/sysv/linux/m68k/____longjmp_chk.c
View File

@ -24,7 +24,7 @@
register unsigned long this_sp asm ("sp"); \
if ((unsigned long) (sp) < this_sp) \
{ \
struct sigaltstack oss; \
stack_t oss; \
INTERNAL_SYSCALL_DECL (err); \
int result = INTERNAL_SYSCALL (sigaltstack, err, 2, NULL, &oss); \
if (!INTERNAL_SYSCALL_ERROR_P (result, err) \

2
sysdeps/unix/sysv/linux/mips/bits/types/stack_t.h
View File

@ -23,7 +23,7 @@
#include <stddef.h>
/* Structure describing a signal stack. */
typedef struct sigaltstack
typedef struct
{
void *ss_sp;
size_t ss_size;

2
sysdeps/unix/sysv/linux/powerpc/sys/procfs.h
View File

@ -83,7 +83,7 @@ struct elf_prstatus
unsigned long int pr_sigpend; /* Set of pending signals. */
unsigned long int pr_sighold; /* Set of held signals. */
#if 0
struct sigaltstack pr_altstack; /* Alternate stack info. */
stack_t pr_altstack; /* Alternate stack info. */
struct sigaction pr_action; /* Signal action for current sig. */
#endif
__pid_t pr_pid;

2
sysdeps/unix/sysv/linux/sh/sys/procfs.h
View File

@ -55,7 +55,7 @@ struct elf_prstatus
unsigned long int pr_sigpend; /* Set of pending signals. */
unsigned long int pr_sighold; /* Set of held signals. */
#if 0
struct sigaltstack pr_altstack; /* Alternate stack info. */
stack_t pr_altstack; /* Alternate stack info. */
struct sigaction pr_action; /* Signal action for current sig. */
#endif
__pid_t pr_pid;

2
sysdeps/unix/sysv/linux/sys/procfs.h
View File

@ -58,7 +58,7 @@ struct elf_prstatus
unsigned long int pr_sigpend; /* Set of pending signals. */
unsigned long int pr_sighold; /* Set of held signals. */
#if 0
struct sigaltstack pr_altstack; /* Alternate stack info. */
stack_t pr_altstack; /* Alternate stack info. */
struct sigaction pr_action; /* Signal action for current sig. */
#endif
__pid_t pr_pid;