lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

signal: Only handle on NSIG signals on signal functions (BZ #25657)

Browse Source 
The upper bits of the sigset_t s not fully initialized in the signal
mask calls that return information from kernel (sigprocmask,
sigpending, and pthread_sigmask), since the exported sigset_t size
(1024 bits) is larger than Linux support one (64 or 128 bits).
It might make sigisemptyset/sigorset/sigandset fail if the mask
is filled prior the call.

This patch changes the internal signal function to handle up to
supported Linux signal number (_NSIG), the remaining bits are
untouched.

Checked on x86_64-linux-gnu and i686-linux-gnu.
This commit is contained in:
Adhemerval Zanella
2020-03-12 09:50:19 -03:00
parent 2f6fa80147
commit 566e10aa72
8 changed files with 238 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
sysdeps/unix/sysv/linux/sigsetops.h
View File

@ -26,83 +26,82 @@
(((unsigned long int) 1) << (((sig) - 1) % (8 * sizeof (unsigned long int))))
/* Return the word index for SIG. */
# define __sigword(sig) (((sig) - 1) / (8 * sizeof (unsigned long int)))
static inline unsigned long int
__sigword (int sig)
{
return (sig - 1) / (8 * sizeof (unsigned long int));
}
# define __sigemptyset(set) \
(__extension__ ({ \
int __cnt = _SIGSET_NWORDS; \
sigset_t *__set = (set); \
while (--__cnt >= 0) \
__set->__val[__cnt] = 0; \
(void)0; \
}))
/* Linux sig* functions only handle up to __NSIG_WORDS words instead of
full _SIGSET_NWORDS sigset size. The signal numbers are 1-based, and
bit 0 of a signal mask is for signal 1. */
# define __sigfillset(set) \
(__extension__ ({ \
int __cnt = _SIGSET_NWORDS; \
sigset_t *__set = (set); \
while (--__cnt >= 0) \
__set->__val[__cnt] = ~0UL; \
(void)0; \
}))
# define __NSIG_WORDS (_NSIG / (8 * sizeof (unsigned long int )))
# define __sigisemptyset(set) \
(__extension__ ({ \
int __cnt = _SIGSET_NWORDS; \
const sigset_t *__set = (set); \
int __ret = __set->__val[--__cnt]; \
while (!__ret && --__cnt >= 0) \
__ret = __set->__val[__cnt]; \
__ret == 0; \
}))
static inline void
__sigemptyset (sigset_t *set)
{
int cnt = __NSIG_WORDS;
while (--cnt >= 0)
set->__val[cnt] = 0;
}
# define __sigandset(dest, left, right) \
(__extension__ ({ \
int __cnt = _SIGSET_NWORDS; \
sigset_t *__dest = (dest); \
const sigset_t *__left = (left); \
const sigset_t *__right = (right); \
while (--__cnt >= 0) \
__dest->__val[__cnt] = (__left->__val[__cnt] \
& __right->__val[__cnt]); \
(void)0; \
}))
static inline void
__sigfillset (sigset_t *set)
{
int cnt = __NSIG_WORDS;
while (--cnt >= 0)
set->__val[cnt] = ~0UL;
}
# define __sigorset(dest, left, right) \
(__extension__ ({ \
int __cnt = _SIGSET_NWORDS; \
sigset_t *__dest = (dest); \
const sigset_t *__left = (left); \
const sigset_t *__right = (right); \
while (--__cnt >= 0) \
__dest->__val[__cnt] = (__left->__val[__cnt] \
| __right->__val[__cnt]); \
(void)0; \
}))
static inline int
__sigisemptyset (const sigset_t *set)
{
int cnt = __NSIG_WORDS;
int ret = set->__val[--cnt];
while (ret == 0 && --cnt >= 0)
ret = set->__val[cnt];
return ret == 0;
}
/* These macros needn't check for a bogus signal number;
error checking is done in the non-__ versions. */
# define __sigismember(set, sig) \
(__extension__ ({ \
unsigned long int __mask = __sigmask (sig); \
unsigned long int __word = __sigword (sig); \
(set)->__val[__word] & __mask ? 1 : 0; \
}))
static inline void
__sigandset (sigset_t *dest, const sigset_t *left, const sigset_t *right)
{
int cnt = __NSIG_WORDS;
while (--cnt >= 0)
dest->__val[cnt] = left->__val[cnt] & right->__val[cnt];
}
# define __sigaddset(set, sig) \
(__extension__ ({ \
unsigned long int __mask = __sigmask (sig); \
unsigned long int __word = __sigword (sig); \
(set)->__val[__word] |= __mask; \
(void)0; \
}))
static inline void
__sigorset (sigset_t *dest, const sigset_t *left, const sigset_t *right)
{
int cnt = __NSIG_WORDS;
while (--cnt >= 0)
dest->__val[cnt] = left->__val[cnt] | right->__val[cnt];
}
# define __sigdelset(set, sig) \
(__extension__ ({ \
unsigned long int __mask = __sigmask (sig); \
unsigned long int __word = __sigword (sig); \
(set)->__val[__word] &= ~__mask; \
(void)0; \
}))
static inline int
__sigismember (const sigset_t *set, int sig)
{
unsigned long int mask = __sigmask (sig);
unsigned long int word = __sigword (sig);
return set->__val[word] & mask ? 1 : 0;
}
static inline void
__sigaddset (sigset_t *set, int sig)
{
unsigned long int mask = __sigmask (sig);
unsigned long int word = __sigword (sig);
set->__val[word] |= mask;
}
static inline void
__sigdelset (sigset_t *set, int sig)
{
unsigned long int mask = __sigmask (sig);
unsigned long int word = __sigword (sig);
set->__val[word] &= ~mask;
}
#endif /* bits/sigsetops.h */