AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove CHECK_SIGSET and CHECK_SIGSET_NULL_OK.

Browse Source
This commit is contained in:
Joseph Myers 2013-01-31 23:00:15 +00:00
parent 2e8a5c8c46
commit 32a45bea39
15 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ChangeLog
View File

@ -1,5 +1,37 @@
2013-01-31 Joseph Myers <joseph@codesourcery.com>
[BZ #13550]
* sysdeps/generic/bp-checks.h (CHECK_SIGSET): Remove both
definitions.
(CHECK_SIGSET_NULL_OK): Likewise.
* sysdeps/unix/sysv/linux/sigpending.c: Don't include
<bp-checks.h>.
(sigpending): Don't use CHECK_SIGSET.
* sysdeps/unix/sysv/linux/sigprocmask.c: Don't include
<bp-checks.h>.
(__sigprocmask): Don't use CHECK_SIGSET and CHECK_SIGSET_NULL_OK.
* sysdeps/unix/sysv/linux/sigsuspend.c: Don't include
<bp-checks.h>.
(do_sigsuspend): Don't use CHECK_SIGSET.
* sysdeps/unix/sysv/linux/sigtimedwait.c (do_sigtimedwait): Don't
use CHECK_SIGSET.
* sysdeps/unix/sysv/linux/sigwait.c: Don't include <bp-checks.h>.
(do_sigwait): Don't use CHECK_SIGSET.
* sysdeps/unix/sysv/linux/sigwaitinfo.c (do_sigwaitinfo): Don't
use CHECK_SIGSET.
* sysdeps/unix/sysv/linux/sparc/sparc64/sigpending.c: Don't
include <bp-checks.h>.
(sigpending): Don't use CHECK_SIGSET.
* sysdeps/unix/sysv/linux/sparc/sparc64/sigprocmask.c: Don't
include <bp-checks.h>.
(__sigprocmask): Don't use CHECK_SIGSET and CHECK_SIGSET_NULL_OK.
* sysdeps/unix/sysv/linux/x86_64/sigpending.c: Don't include
<bp-checks.h>.
(sigpending): Don't use CHECK_SIGSET.
* sysdeps/unix/sysv/linux/x86_64/sigprocmask.c: Don't include
<bp-checks.h>.
(__sigprocmask): Don't use CHECK_SIGSET and CHECK_SIGSET_NULL_OK.
[BZ #13550]
* sysdeps/generic/bp-semctl.h: Remove file.
* sysdeps/unix/sysv/linux/i386/semctl.c: Don't include

10
ports/ChangeLog.ia64
View File

@ -1,3 +1,13 @@
2013-01-31 Joseph Myers <joseph@codesourcery.com>
[BZ #13550]
* sysdeps/unix/sysv/linux/ia64/sigpending.c: Don't include
<bp-checks.h>.
(sigpending): Don't use CHECK_SIGSET.
* sysdeps/unix/sysv/linux/ia64/sigprocmask.c: Don't include
<bp-checks.h>.
(__sigprocmask): Don't use CHECK_SIGSET and CHECK_SIGSET_NULL_OK.
2013-01-02 Joseph Myers <joseph@codesourcery.com>
* All files with FSF copyright notices: Update copyright dates

3
ports/sysdeps/unix/sysv/linux/ia64/sigpending.c
View File

@ -24,7 +24,6 @@
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
/* Change the set of blocked signals to SET,
wait until a signal arrives, and restore the set of blocked signals. */
@ -34,5 +33,5 @@ sigpending (set)
{
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
return INLINE_SYSCALL (rt_sigpending, 2, CHECK_SIGSET (set), _NSIG / 8);
return INLINE_SYSCALL (rt_sigpending, 2, set, _NSIG / 8);
}

4
ports/sysdeps/unix/sysv/linux/ia64/sigprocmask.c
View File

@ -26,7 +26,6 @@
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
/* Get and/or change the set of blocked signals. */
int
@ -38,7 +37,6 @@ __sigprocmask (how, set, oset)
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
return INLINE_SYSCALL (rt_sigprocmask, 4, how, CHECK_SIGSET (set),
CHECK_SIGSET_NULL_OK (oset), _NSIG / 8);
return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8);
}
weak_alias (__sigprocmask, sigprocmask)

7
sysdeps/generic/bp-checks.h
View File

@ -66,11 +66,6 @@ extern void *__unbounded __ubp_memchr (const void *__unbounded, int, unsigned);
/* Same as CHECK_STRING, but tolerate ARG == NULL. */
# define CHECK_STRING_NULL_OK(ARG) _CHECK_STRING ((ARG), __ptrvalue (ARG))
/* Check bounds of signal syscall args with type sigset_t. */
# define CHECK_SIGSET(SET) CHECK_N ((SET), _NSIG / (8 * sizeof *(SET)))
/* Same as CHECK_SIGSET, but tolerate SET == NULL. */
# define CHECK_SIGSET_NULL_OK(SET) CHECK_N_NULL_OK ((SET), _NSIG / (8 * sizeof *(SET)))
# if defined (_IOC_SIZESHIFT) && defined (_IOC_SIZEBITS)
/* Extract the size of the ioctl data and check its bounds. */
# define CHECK_IOCTL(ARG, CMD) \
@ -114,8 +109,6 @@ extern void *__unbounded __ubp_memchr (const void *__unbounded, int, unsigned);
# define CHECK_N(ARG, N) (ARG)
# define CHECK_N_NULL_OK(ARG, N) (ARG)
# define CHECK_STRING(ARG) (ARG)
# define CHECK_SIGSET(SET) (SET)
# define CHECK_SIGSET_NULL_OK(SET) (SET)
# define CHECK_IOCTL(ARG, CMD) (ARG)
# define CHECK_FCNTL(ARG, CMD) (ARG)
# define CHECK_N_PAGES(ARG, NBYTES) (ARG)

3
sysdeps/unix/sysv/linux/sigpending.c
View File

@ -21,7 +21,6 @@
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
#include <kernel-features.h>
@ -32,5 +31,5 @@ int
sigpending (set)
sigset_t *set;
{
return INLINE_SYSCALL (rt_sigpending, 2, CHECK_SIGSET (set), _NSIG / 8);
return INLINE_SYSCALL (rt_sigpending, 2, set, _NSIG / 8);
}

4
sysdeps/unix/sysv/linux/sigprocmask.c
View File

@ -22,7 +22,6 @@
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
#include <kernel-features.h>
@ -55,7 +54,6 @@ __sigprocmask (how, set, oset)
}
#endif
return INLINE_SYSCALL (rt_sigprocmask, 4, how, CHECK_SIGSET_NULL_OK (set),
CHECK_SIGSET_NULL_OK (oset), _NSIG / 8);
return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8);
}
weak_alias (__sigprocmask, sigprocmask)

3
sysdeps/unix/sysv/linux/sigsuspend.c
View File

@ -21,7 +21,6 @@
#include <sysdep-cancel.h>
#include <sys/syscall.h>
#include <bp-checks.h>
#include <kernel-features.h>
@ -29,7 +28,7 @@
static inline int __attribute__ ((always_inline))
do_sigsuspend (const sigset_t *set)
{
return INLINE_SYSCALL (rt_sigsuspend, 2, CHECK_SIGSET (set), _NSIG / 8);
return INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8);
}
/* Change the set of blocked signals to SET,

2
sysdeps/unix/sysv/linux/sigtimedwait.c
View File

@ -51,7 +51,7 @@ do_sigtimedwait (const sigset_t *set, siginfo_t *info,
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
int result = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),
int result = INLINE_SYSCALL (rt_sigtimedwait, 4, set,
CHECK_1 (info), timeout, _NSIG / 8);
/* The kernel generates a SI_TKILL code in si_code in case tkill is

6
sysdeps/unix/sysv/linux/sigwait.c
View File

@ -23,7 +23,6 @@
#include <sysdep-cancel.h>
#include <sys/syscall.h>
#include <bp-checks.h>
#ifdef __NR_rt_sigtimedwait
@ -58,7 +57,7 @@ do_sigwait (const sigset_t *set, int *sig)
#ifdef INTERNAL_SYSCALL
INTERNAL_SYSCALL_DECL (err);
do
ret = INTERNAL_SYSCALL (rt_sigtimedwait, err, 4, CHECK_SIGSET (set),
ret = INTERNAL_SYSCALL (rt_sigtimedwait, err, 4, set,
NULL, NULL, _NSIG / 8);
while (INTERNAL_SYSCALL_ERROR_P (ret, err)
&& INTERNAL_SYSCALL_ERRNO (ret, err) == EINTR);
@ -71,8 +70,7 @@ do_sigwait (const sigset_t *set, int *sig)
ret = INTERNAL_SYSCALL_ERRNO (ret, err);
#else
do
ret = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),
NULL, NULL, _NSIG / 8);
ret = INLINE_SYSCALL (rt_sigtimedwait, 4, set, NULL, NULL, _NSIG / 8);
while (ret == -1 && errno == EINTR);
if (ret != -1)
{

2
sysdeps/unix/sysv/linux/sigwaitinfo.c
View File

@ -52,7 +52,7 @@ do_sigwaitinfo (const sigset_t *set, siginfo_t *info)
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
int result = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),
int result = INLINE_SYSCALL (rt_sigtimedwait, 4, set,
CHECK_1 (info), NULL, _NSIG / 8);
/* The kernel generates a SI_TKILL code in si_code in case tkill is

3
sysdeps/unix/sysv/linux/sparc/sparc64/sigpending.c
View File

@ -21,7 +21,6 @@
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
/* Change the set of blocked signals to SET,
wait until a signal arrives, and restore the set of blocked signals. */
@ -31,5 +30,5 @@ sigpending (set)
{
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
return INLINE_SYSCALL (rt_sigpending, 2, CHECK_SIGSET (set), _NSIG / 8);
return INLINE_SYSCALL (rt_sigpending, 2, set, _NSIG / 8);
}

4
sysdeps/unix/sysv/linux/sparc/sparc64/sigprocmask.c
View File

@ -21,7 +21,6 @@
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
/* Get and/or change the set of blocked signals. */
int
@ -32,7 +31,6 @@ __sigprocmask (how, set, oset)
{
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
return INLINE_SYSCALL (rt_sigprocmask, 4, how, CHECK_SIGSET (set),
CHECK_SIGSET_NULL_OK (oset), _NSIG / 8);
return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8);
}
weak_alias (__sigprocmask, sigprocmask)

3
sysdeps/unix/sysv/linux/x86_64/sigpending.c
View File

@ -24,7 +24,6 @@
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
/* Change the set of blocked signals to SET,
wait until a signal arrives, and restore the set of blocked signals. */
@ -34,5 +33,5 @@ sigpending (set)
{
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
return INLINE_SYSCALL (rt_sigpending, 2, CHECK_SIGSET (set), _NSIG / 8);
return INLINE_SYSCALL (rt_sigpending, 2, set, _NSIG / 8);
}

4
sysdeps/unix/sysv/linux/x86_64/sigprocmask.c
View File

@ -25,7 +25,6 @@
#include <sysdep.h>
#include <sys/syscall.h>
#include <bp-checks.h>
/* Get and/or change the set of blocked signals. */
int
@ -37,7 +36,6 @@ __sigprocmask (how, set, oset)
/* XXX The size argument hopefully will have to be changed to the
real size of the user-level sigset_t. */
return INLINE_SYSCALL (rt_sigprocmask, 4, how, CHECK_SIGSET (set),
CHECK_SIGSET_NULL_OK (oset), _NSIG / 8);
return INLINE_SYSCALL (rt_sigprocmask, 4, how, set, oset, _NSIG / 8);
}
weak_alias (__sigprocmask, sigprocmask)