From f3aae3f3eb4e4345413dc238e941cdb52f747d16 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 8 Feb 2013 01:12:11 +0000 Subject: Remove CHECK_1 and CHECK_1_NULL_OK. --- ChangeLog | 93 ++++++++++++++++++++++ ports/ChangeLog.aarch64 | 7 ++ ports/ChangeLog.alpha | 10 +++ ports/ChangeLog.ia64 | 7 ++ ports/ChangeLog.mips | 13 +++ .../sysdeps/unix/sysv/linux/aarch64/gettimeofday.c | 3 +- ports/sysdeps/unix/sysv/linux/alpha/msgctl.c | 3 +- ports/sysdeps/unix/sysv/linux/alpha/shmctl.c | 3 +- ports/sysdeps/unix/sysv/linux/ia64/sigaction.c | 4 +- ports/sysdeps/unix/sysv/linux/mips/mips64/msgctl.c | 4 +- ports/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c | 4 +- ports/sysdeps/unix/sysv/linux/mips/ustat.c | 3 +- sysdeps/generic/bp-checks.h | 7 -- sysdeps/unix/sysv/linux/fxstat.c | 3 +- sysdeps/unix/sysv/linux/fxstat64.c | 3 +- sysdeps/unix/sysv/linux/fxstatat.c | 5 +- sysdeps/unix/sysv/linux/fxstatat64.c | 5 +- sysdeps/unix/sysv/linux/i386/fxstat.c | 3 +- sysdeps/unix/sysv/linux/i386/fxstatat.c | 5 +- sysdeps/unix/sysv/linux/i386/getresgid.c | 4 +- sysdeps/unix/sysv/linux/i386/getresuid.c | 4 +- sysdeps/unix/sysv/linux/i386/lxstat.c | 3 +- sysdeps/unix/sysv/linux/i386/msgctl.c | 6 +- sysdeps/unix/sysv/linux/i386/setrlimit.c | 3 +- sysdeps/unix/sysv/linux/i386/shmctl.c | 6 +- sysdeps/unix/sysv/linux/i386/xstat.c | 3 +- sysdeps/unix/sysv/linux/lxstat.c | 4 +- sysdeps/unix/sysv/linux/lxstat64.c | 3 +- sysdeps/unix/sysv/linux/msgctl.c | 9 +-- sysdeps/unix/sysv/linux/powerpc/gettimeofday.c | 3 +- sysdeps/unix/sysv/linux/ptrace.c | 72 ----------------- sysdeps/unix/sysv/linux/s390/gettimeofday.c | 3 +- sysdeps/unix/sysv/linux/shmctl.c | 11 +-- sysdeps/unix/sysv/linux/sigtimedwait.c | 3 +- sysdeps/unix/sysv/linux/sigwaitinfo.c | 3 +- sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c | 3 +- sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c | 3 +- sysdeps/unix/sysv/linux/ustat.c | 3 +- sysdeps/unix/sysv/linux/wordsize-64/fxstat.c | 3 +- sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c | 5 +- sysdeps/unix/sysv/linux/wordsize-64/lxstat.c | 3 +- sysdeps/unix/sysv/linux/wordsize-64/xstat.c | 3 +- sysdeps/unix/sysv/linux/xstat.c | 4 +- sysdeps/unix/sysv/linux/xstat64.c | 3 +- 44 files changed, 179 insertions(+), 176 deletions(-) diff --git a/ChangeLog b/ChangeLog index a192314..e387dd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,99 @@ 2013-02-08 Joseph Myers [BZ #13550] + * sysdeps/generic/bp-checks.h (CHECK_1): Remove all definitions. + (CHECK_1_NULL_OK): Likewise. + * sysdeps/unix/sysv/linux/fxstat.c: Do not include . + (__fxstat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/fxstat64.c: Do not include + . + (___fxstat64): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/fxstatat.c: Do not include + . + (__fxstatat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/fxstatat64.c: Do not include + . + (__fxstatat64): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/i386/fxstat.c: Do not include + . + (__fxstat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/i386/fxstatat.c: Do not include + . + (__fxstatat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/i386/getresgid.c: Do not include + . + (__getresgid): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/i386/getresuid.c: Do not include + . + (__getresuid): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/i386/lxstat.c: Do not include + . + (__lxstat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/i386/msgctl.c: Do not include + . + (__old_msgctl): Do not use CHECK_1. + (__new_msgctl): Likewise. + * sysdeps/unix/sysv/linux/i386/setrlimit.c: Do not include + . + (__new_setrlimit): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/i386/shmctl.c: Do not include + . + (__old_shmctl): Do not use CHECK_1. + (__new_shmctl): Likewise. + * sysdeps/unix/sysv/linux/i386/xstat.c: Do not include + . + (__xstat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/lxstat.c: Do not include . + (__lxstat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/lxstat64.c: Do not include + . + (___lxstat64): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/msgctl.c: Do not include . + (__old_msgctl): Do not use CHECK_1. + (__new_msgctl): Likewise. + * sysdeps/unix/sysv/linux/powerpc/gettimeofday.c: Do not include + . + (__gettimeofday): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/ptrace.c: Do not include . + (ptrace) [__BOUNDED_POINTERS__]: Remove conditional code. + * sysdeps/unix/sysv/linux/s390/gettimeofday.c: Do not include + . + (__gettimeofday): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/shmctl.c: Do not include . + (__old_shmctl): Do not use CHECK_1_NULL_OK. + (__new_shmctl): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/sigtimedwait.c: Do not include + . + (do_sigtimedwait): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/sigwaitinfo.c: Do not include + . + (do_sigwaitinfo): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c: Do not include + . + (msgctl): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c: Do not include + . + (shmctl): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/ustat.c: Do not include . + (ustat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/wordsize-64/fxstat.c: Do not include + . + (__fxstat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c: Do not include + . + (__fxstatat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/wordsize-64/lxstat.c: Do not include + . + (__lxstat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/wordsize-64/xstat.c: Do not include + . + (__xstat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/xstat.c: Do not include . + (__xstat): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/xstat64.c: Do not include . + (___xstat64): Do not use CHECK_1. + + [BZ #13550] * sysdeps/generic/bp-checks.h (CHECK_BOUNDS_LOW): Remove all definitions. (CHECK_BOUNDS_HIGH): Likewise. diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64 index 5a42510..767e1f1 100644 --- a/ports/ChangeLog.aarch64 +++ b/ports/ChangeLog.aarch64 @@ -1,3 +1,10 @@ +2013-02-08 Joseph Myers + + [BZ #13550] + * sysdeps/unix/sysv/linux/aarch64/gettimeofday.c: Do not include + . + (__gettimeofday): Do not use CHECK_1. + 2013-01-23 Marcus Shawcroft * sysdeps/aarch64/strncmp.S: New file. diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha index 758e97c..f631c5b 100644 --- a/ports/ChangeLog.alpha +++ b/ports/ChangeLog.alpha @@ -1,3 +1,13 @@ +2013-02-08 Joseph Myers + + [BZ #13550] + * sysdeps/unix/sysv/linux/alpha/msgctl.c: Do not include + . + (__new_msgctl): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/alpha/shmctl.c: Do not include + . + (__new_shmctl): Do not use CHECK_1. + 2013-01-31 Joseph Myers [BZ #13550] diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64 index 3b00daf..26d99f7 100644 --- a/ports/ChangeLog.ia64 +++ b/ports/ChangeLog.ia64 @@ -1,3 +1,10 @@ +2013-02-08 Joseph Myers + + [BZ #13550] + * sysdeps/unix/sysv/linux/ia64/sigaction.c: Do not include + . + (__libc_sigaction): Do not use CHECK_1_NULL_OK. + 2013-02-04 Joseph Myers [BZ #13550] diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index f1496e2..b04001e 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,3 +1,16 @@ +2013-02-08 Joseph Myers + + [BZ #13550] + * sysdeps/unix/sysv/linux/mips/mips64/msgctl.c: Do not include + . + (__msgctl): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/mips/mips64/shmctl.c: Do not include + . + (__shmctl): Do not use CHECK_1. + * sysdeps/unix/sysv/linux/mips/ustat.c: Do not include + . + (ustat): Do not use CHECK_1. + 2013-02-05 Maciej W. Rozycki * sysdeps/unix/sysv/linux/mips/mips32/sysdep.h: Add a missing diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c b/ports/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c index 1da284d..4d1ec3b 100644 --- a/ports/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c +++ b/ports/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c @@ -22,7 +22,6 @@ #undef __gettimeofday #include -#include /* Get the current time of day and timezone information, putting it into *tv and *tz. If tz is null, *tz is not filled. @@ -32,7 +31,7 @@ __gettimeofday (tv, tz) struct timeval *tv; struct timezone *tz; { - return INLINE_VSYSCALL (gettimeofday, 2, CHECK_1 (tv), CHECK_1 (tz)); + return INLINE_VSYSCALL (gettimeofday, 2, tv, tz); } libc_hidden_def (__gettimeofday) weak_alias (__gettimeofday, gettimeofday) diff --git a/ports/sysdeps/unix/sysv/linux/alpha/msgctl.c b/ports/sysdeps/unix/sysv/linux/alpha/msgctl.c index b4633f4..dbd03c1 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/msgctl.c +++ b/ports/sysdeps/unix/sysv/linux/alpha/msgctl.c @@ -21,13 +21,12 @@ #include #include #include -#include int __new_msgctl (int msqid, int cmd, struct msqid_ds *buf) { - return INLINE_SYSCALL (msgctl, 3, msqid, cmd | __IPC_64, CHECK_1 (buf)); + return INLINE_SYSCALL (msgctl, 3, msqid, cmd | __IPC_64, buf); } #include diff --git a/ports/sysdeps/unix/sysv/linux/alpha/shmctl.c b/ports/sysdeps/unix/sysv/linux/alpha/shmctl.c index 5e52200..f2217a2 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/shmctl.c +++ b/ports/sysdeps/unix/sysv/linux/alpha/shmctl.c @@ -22,13 +22,12 @@ #include #include #include -#include int __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) { - return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, CHECK_1 (buf)); + return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, buf); } #include diff --git a/ports/sysdeps/unix/sysv/linux/ia64/sigaction.c b/ports/sysdeps/unix/sysv/linux/ia64/sigaction.c index b41c6c3..664d0e1 100644 --- a/ports/sysdeps/unix/sysv/linux/ia64/sigaction.c +++ b/ports/sysdeps/unix/sysv/linux/ia64/sigaction.c @@ -26,7 +26,6 @@ #include #include -#include /* The variable is shared between all wrappers around signal handling functions which have RT equivalents. This is the definition. */ @@ -42,8 +41,7 @@ __libc_sigaction (sig, act, oact) { /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ - return INLINE_SYSCALL (rt_sigaction, 4, sig, - CHECK_1_NULL_OK (act), CHECK_1_NULL_OK (oact), _NSIG / 8); + return INLINE_SYSCALL (rt_sigaction, 4, sig, act, oact, _NSIG / 8); } libc_hidden_def (__libc_sigaction) diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/msgctl.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/msgctl.c index b8905ed..3b94b1b 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/msgctl.c +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/msgctl.c @@ -20,14 +20,12 @@ #include #include -#include - int __msgctl (int msqid, int cmd, struct msqid_ds *buf); int __msgctl (int msqid, int cmd, struct msqid_ds *buf) { - return INLINE_SYSCALL (msgctl, 3, msqid, cmd | __IPC_64, CHECK_1 (buf)); + return INLINE_SYSCALL (msgctl, 3, msqid, cmd | __IPC_64, buf); } #include diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c index 9b183f3..197f7eb 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/shmctl.c @@ -20,14 +20,12 @@ #include #include -#include - int __shmctl (int shmid, int cmd, struct shmid_ds *buf); int __shmctl (int shmid, int cmd, struct shmid_ds *buf) { - return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, CHECK_1 (buf)); + return INLINE_SYSCALL (shmctl, 3, shmid, cmd | __IPC_64, buf); } #include diff --git a/ports/sysdeps/unix/sysv/linux/mips/ustat.c b/ports/sysdeps/unix/sysv/linux/mips/ustat.c index f05bba6..6db482e 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/ustat.c +++ b/ports/sysdeps/unix/sysv/linux/mips/ustat.c @@ -22,7 +22,6 @@ #include #include -#include int ustat (dev_t dev, struct ustat *ubuf) @@ -32,5 +31,5 @@ ustat (dev_t dev, struct ustat *ubuf) /* We must convert the value to dev_t type used by the kernel. */ k_dev = ((major (dev) & 0xff) << 8) | (minor (dev) & 0xff); - return INLINE_SYSCALL (ustat, 2, k_dev, CHECK_1 (ubuf)); + return INLINE_SYSCALL (ustat, 2, k_dev, ubuf); } diff --git a/sysdeps/generic/bp-checks.h b/sysdeps/generic/bp-checks.h index 618497c..162f785 100644 --- a/sysdeps/generic/bp-checks.h +++ b/sysdeps/generic/bp-checks.h @@ -36,18 +36,11 @@ /* Same as CHECK_N, but tolerate ARG == NULL. */ # define CHECK_N_NULL_OK(ARG, N) _CHECK_N ((ARG), (N), __ptrvalue (ARG)) -/* Check bounds of a pointer seated to a single object. */ -# define CHECK_1(ARG) CHECK_N ((ARG), 1) -/* Same as CHECK_1, but tolerate ARG == NULL. */ -# define CHECK_1_NULL_OK(ARG) CHECK_N_NULL_OK ((ARG), 1) - #else /* !__BOUNDED_POINTERS__ */ /* Do nothing if not compiling with -fbounded-pointers. */ # define BOUNDS_VIOLATED -# define CHECK_1(ARG) (ARG) -# define CHECK_1_NULL_OK(ARG) (ARG) # define CHECK_N(ARG, N) (ARG) # define CHECK_N_NULL_OK(ARG, N) (ARG) diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c index d2dd109..06a7fc0 100644 --- a/sysdeps/unix/sysv/linux/fxstat.c +++ b/sysdeps/unix/sysv/linux/fxstat.c @@ -28,7 +28,6 @@ #include #include -#include #include @@ -37,7 +36,7 @@ int __fxstat (int vers, int fd, struct stat *buf) { if (vers == _STAT_VER_KERNEL) - return INLINE_SYSCALL (fstat, 2, fd, CHECK_1 ((struct kernel_stat *) buf)); + return INLINE_SYSCALL (fstat, 2, fd, (struct kernel_stat *) buf); #ifdef STAT_IS_KERNEL_STAT errno = EINVAL; diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c index a13beeb..3cb1c35 100644 --- a/sysdeps/unix/sysv/linux/fxstat64.c +++ b/sysdeps/unix/sysv/linux/fxstat64.c @@ -23,7 +23,6 @@ #include #include -#include #include @@ -33,7 +32,7 @@ int ___fxstat64 (int vers, int fd, struct stat64 *buf) { int result; - result = INLINE_SYSCALL (fstat64, 2, fd, CHECK_1 (buf)); + result = INLINE_SYSCALL (fstat64, 2, fd, buf); #if defined _HAVE_STAT64___ST_INO && __ASSUME_ST_INO_64_BIT == 0 if (__builtin_expect (!result, 1) && buf->__st_ino != (__ino_t) buf->st_ino) buf->st_ino = buf->__st_ino; diff --git a/sysdeps/unix/sysv/linux/fxstatat.c b/sysdeps/unix/sysv/linux/fxstatat.c index c0835bb..2578eea 100644 --- a/sysdeps/unix/sysv/linux/fxstatat.c +++ b/sysdeps/unix/sysv/linux/fxstatat.c @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -110,10 +109,10 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) { if (flag & AT_SYMLINK_NOFOLLOW) result = INTERNAL_SYSCALL (lstat, err, 2, file, - CHECK_1 ((struct kernel_stat *) st)); + (struct kernel_stat *) st); else result = INTERNAL_SYSCALL (stat, err, 2, file, - CHECK_1 ((struct kernel_stat *) st)); + (struct kernel_stat *) st); if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1)) return result; diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c index c81fe18..abd39ea 100644 --- a/sysdeps/unix/sysv/linux/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/fxstatat64.c @@ -25,7 +25,6 @@ #include #include -#include #include @@ -99,9 +98,9 @@ __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) } if (flag & AT_SYMLINK_NOFOLLOW) - result = INTERNAL_SYSCALL (lstat64, err, 2, file, CHECK_1 (st)); + result = INTERNAL_SYSCALL (lstat64, err, 2, file, st); else - result = INTERNAL_SYSCALL (stat64, err, 2, file, CHECK_1 (st)); + result = INTERNAL_SYSCALL (stat64, err, 2, file, st); if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1)) { # if defined _HAVE_STAT64___ST_INO && __ASSUME_ST_INO_64_BIT == 0 diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.c b/sysdeps/unix/sysv/linux/i386/fxstat.c index 0ab94f5..8ceb269 100644 --- a/sysdeps/unix/sysv/linux/i386/fxstat.c +++ b/sysdeps/unix/sysv/linux/i386/fxstat.c @@ -27,7 +27,6 @@ #include #include -#include #include @@ -40,7 +39,7 @@ __fxstat (int vers, int fd, struct stat *buf) int result; if (vers == _STAT_VER_KERNEL) - return INLINE_SYSCALL (fstat, 2, fd, CHECK_1 ((struct kernel_stat *) buf)); + return INLINE_SYSCALL (fstat, 2, fd, (struct kernel_stat *) buf); { struct stat64 buf64; diff --git a/sysdeps/unix/sysv/linux/i386/fxstatat.c b/sysdeps/unix/sysv/linux/i386/fxstatat.c index 3f5420c..a98c6c8 100644 --- a/sysdeps/unix/sysv/linux/i386/fxstatat.c +++ b/sysdeps/unix/sysv/linux/i386/fxstatat.c @@ -29,7 +29,6 @@ #include #include -#include #include @@ -103,10 +102,10 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) { if (flag & AT_SYMLINK_NOFOLLOW) result = INTERNAL_SYSCALL (lstat, err, 2, file, - CHECK_1 ((struct kernel_stat *) st)); + (struct kernel_stat *) st); else result = INTERNAL_SYSCALL (stat, err, 2, file, - CHECK_1 ((struct kernel_stat *) st)); + (struct kernel_stat *) st); goto out; } diff --git a/sysdeps/unix/sysv/linux/i386/getresgid.c b/sysdeps/unix/sysv/linux/i386/getresgid.c index e0b6999..bdc3b82 100644 --- a/sysdeps/unix/sysv/linux/i386/getresgid.c +++ b/sysdeps/unix/sysv/linux/i386/getresgid.c @@ -23,15 +23,13 @@ #include #include -#include /* Consider moving to syscalls.list. */ int __getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid) { - return INLINE_SYSCALL (getresgid32, 3, CHECK_1 (rgid), - CHECK_1 (egid), CHECK_1 (sgid)); + return INLINE_SYSCALL (getresgid32, 3, rgid, egid, sgid); } libc_hidden_def (__getresgid) weak_alias (__getresgid, getresgid) diff --git a/sysdeps/unix/sysv/linux/i386/getresuid.c b/sysdeps/unix/sysv/linux/i386/getresuid.c index 5a06ad6..49b3302 100644 --- a/sysdeps/unix/sysv/linux/i386/getresuid.c +++ b/sysdeps/unix/sysv/linux/i386/getresuid.c @@ -23,15 +23,13 @@ #include #include -#include /* Consider moving to syscalls.list. */ int __getresuid (uid_t *ruid, uid_t *euid, uid_t *suid) { - return INLINE_SYSCALL (getresuid32, 3, CHECK_1 (ruid), - CHECK_1 (euid), CHECK_1 (suid)); + return INLINE_SYSCALL (getresuid32, 3, ruid, euid, suid); } libc_hidden_def (__getresuid) weak_alias (__getresuid, getresuid) diff --git a/sysdeps/unix/sysv/linux/i386/lxstat.c b/sysdeps/unix/sysv/linux/i386/lxstat.c index b083afd..a10f403 100644 --- a/sysdeps/unix/sysv/linux/i386/lxstat.c +++ b/sysdeps/unix/sysv/linux/i386/lxstat.c @@ -27,7 +27,6 @@ #include #include -#include #include @@ -41,7 +40,7 @@ __lxstat (int vers, const char *name, struct stat *buf) int result; if (vers == _STAT_VER_KERNEL) - return INLINE_SYSCALL (lstat, 2, name, CHECK_1 ((struct kernel_stat *) buf)); + return INLINE_SYSCALL (lstat, 2, name, (struct kernel_stat *) buf); { struct stat64 buf64; diff --git a/sysdeps/unix/sysv/linux/i386/msgctl.c b/sysdeps/unix/sysv/linux/i386/msgctl.c index 37cfcb6..f48d8e2 100644 --- a/sysdeps/unix/sysv/linux/i386/msgctl.c +++ b/sysdeps/unix/sysv/linux/i386/msgctl.c @@ -23,7 +23,6 @@ #include #include #include -#include #include @@ -56,8 +55,7 @@ int attribute_compat_text_section __old_msgctl (int msqid, int cmd, struct __old_msqid_ds *buf) { - return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, - msqid, cmd, 0, CHECK_1 (buf)); + return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, msqid, cmd, 0, buf); } compat_symbol (libc, __old_msgctl, msgctl, GLIBC_2_0); #endif @@ -66,7 +64,7 @@ int __new_msgctl (int msqid, int cmd, struct msqid_ds *buf) { return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, - msqid, cmd | __IPC_64, 0, CHECK_1 (buf)); + msqid, cmd | __IPC_64, 0, buf); } versioned_symbol (libc, __new_msgctl, msgctl, GLIBC_2_2); diff --git a/sysdeps/unix/sysv/linux/i386/setrlimit.c b/sysdeps/unix/sysv/linux/i386/setrlimit.c index cc11847..05ccb1c 100644 --- a/sysdeps/unix/sysv/linux/i386/setrlimit.c +++ b/sysdeps/unix/sysv/linux/i386/setrlimit.c @@ -22,7 +22,6 @@ #include #include #include -#include extern int __new_setrlimit (enum __rlimit_resource resource, const struct rlimit *__unboundedrlimits); @@ -32,7 +31,7 @@ extern int __new_setrlimit (enum __rlimit_resource resource, int __new_setrlimit (enum __rlimit_resource resource, const struct rlimit *rlimits) { - return INLINE_SYSCALL (setrlimit, 2, resource, CHECK_1 (rlimits)); + return INLINE_SYSCALL (setrlimit, 2, resource, rlimits); } weak_alias (__new_setrlimit, __setrlimit); diff --git a/sysdeps/unix/sysv/linux/i386/shmctl.c b/sysdeps/unix/sysv/linux/i386/shmctl.c index 15f055d..cb1539a 100644 --- a/sysdeps/unix/sysv/linux/i386/shmctl.c +++ b/sysdeps/unix/sysv/linux/i386/shmctl.c @@ -24,7 +24,6 @@ #include #include #include -#include #include @@ -63,8 +62,7 @@ int attribute_compat_text_section __old_shmctl (int shmid, int cmd, struct __old_shmid_ds *buf) { - return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, - shmid, cmd, 0, CHECK_1 (buf)); + return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); } compat_symbol (libc, __old_shmctl, shmctl, GLIBC_2_0); #endif @@ -73,7 +71,7 @@ int __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) { return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, - shmid, cmd | __IPC_64, 0, CHECK_1 (buf)); + shmid, cmd | __IPC_64, 0, buf); } versioned_symbol (libc, __new_shmctl, shmctl, GLIBC_2_2); diff --git a/sysdeps/unix/sysv/linux/i386/xstat.c b/sysdeps/unix/sysv/linux/i386/xstat.c index 071f7fb..26dc00a 100644 --- a/sysdeps/unix/sysv/linux/i386/xstat.c +++ b/sysdeps/unix/sysv/linux/i386/xstat.c @@ -27,7 +27,6 @@ #include #include -#include #include @@ -41,7 +40,7 @@ __xstat (int vers, const char *name, struct stat *buf) int result; if (vers == _STAT_VER_KERNEL) - return INLINE_SYSCALL (stat, 2, name, CHECK_1 ((struct kernel_stat *) buf)); + return INLINE_SYSCALL (stat, 2, name, (struct kernel_stat *) buf); { struct stat64 buf64; diff --git a/sysdeps/unix/sysv/linux/lxstat.c b/sysdeps/unix/sysv/linux/lxstat.c index f76e081..5f7bce2 100644 --- a/sysdeps/unix/sysv/linux/lxstat.c +++ b/sysdeps/unix/sysv/linux/lxstat.c @@ -27,7 +27,6 @@ #include #include -#include #include @@ -36,8 +35,7 @@ int __lxstat (int vers, const char *name, struct stat *buf) { if (vers == _STAT_VER_KERNEL) - return INLINE_SYSCALL (lstat, 2, name, - CHECK_1 ((struct kernel_stat *) buf)); + return INLINE_SYSCALL (lstat, 2, name, (struct kernel_stat *) buf); #ifdef STAT_IS_KERNEL_STAT errno = EINVAL; diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c index c6199bb..de88996 100644 --- a/sysdeps/unix/sysv/linux/lxstat64.c +++ b/sysdeps/unix/sysv/linux/lxstat64.c @@ -23,7 +23,6 @@ #include #include -#include #include @@ -32,7 +31,7 @@ int ___lxstat64 (int vers, const char *name, struct stat64 *buf) { int result; - result = INLINE_SYSCALL (lstat64, 2, name, CHECK_1 (buf)); + result = INLINE_SYSCALL (lstat64, 2, name, buf); #if defined _HAVE_STAT64___ST_INO && __ASSUME_ST_INO_64_BIT == 0 if (__builtin_expect (!result, 1) && buf->__st_ino != (__ino_t) buf->st_ino) buf->st_ino = buf->__st_ino; diff --git a/sysdeps/unix/sysv/linux/msgctl.c b/sysdeps/unix/sysv/linux/msgctl.c index 4dc6b08..2483ebb 100644 --- a/sysdeps/unix/sysv/linux/msgctl.c +++ b/sysdeps/unix/sysv/linux/msgctl.c @@ -24,7 +24,6 @@ #include #include #include -#include #include @@ -57,7 +56,7 @@ int attribute_compat_text_section __old_msgctl (int msqid, int cmd, struct __old_msqid_ds *buf) { - return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, msqid, cmd, 0, CHECK_1 (buf)); + return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, msqid, cmd, 0, buf); } compat_symbol (libc, __old_msgctl, msgctl, GLIBC_2_0); #endif @@ -67,7 +66,7 @@ __new_msgctl (int msqid, int cmd, struct msqid_ds *buf) { #if __ASSUME_IPC64 > 0 return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, - msqid, cmd | __IPC_64, 0, CHECK_1 (buf)); + msqid, cmd | __IPC_64, 0, buf); #else switch (cmd) { case MSG_STAT: @@ -76,7 +75,7 @@ __new_msgctl (int msqid, int cmd, struct msqid_ds *buf) break; default: return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, - msqid, cmd, 0, CHECK_1 (buf)); + msqid, cmd, 0, buf); } { @@ -86,7 +85,7 @@ __new_msgctl (int msqid, int cmd, struct msqid_ds *buf) /* Unfortunately there is no way how to find out for sure whether we should use old or new msgctl. */ result = INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, - msqid, cmd | __IPC_64, 0, CHECK_1 (buf)); + msqid, cmd | __IPC_64, 0, buf); if (result != -1 || errno != EINVAL) return result; diff --git a/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c b/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c index 36512a0..f607485 100644 --- a/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c +++ b/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c @@ -16,7 +16,6 @@ . */ #include -#include #include #include #include @@ -33,7 +32,7 @@ __gettimeofday (tv, tz) struct timeval *tv; struct timezone *tz; { - return INLINE_VSYSCALL (gettimeofday, 2, CHECK_1 (tv), CHECK_1 (tz)); + return INLINE_VSYSCALL (gettimeofday, 2, tv, tz); } libc_hidden_def (__gettimeofday) weak_alias (__gettimeofday, gettimeofday) diff --git a/sysdeps/unix/sysv/linux/ptrace.c b/sysdeps/unix/sysv/linux/ptrace.c index 926dfbd..e94cbd5 100644 --- a/sysdeps/unix/sysv/linux/ptrace.c +++ b/sysdeps/unix/sysv/linux/ptrace.c @@ -24,7 +24,6 @@ #include #include -#include long int ptrace (enum __ptrace_request request, ...) @@ -43,77 +42,6 @@ ptrace (enum __ptrace_request request, ...) if (request > 0 && request < 4) data = &ret; -#if __BOUNDED_POINTERS__ - switch (request) - { - case PTRACE_PEEKTEXT: - case PTRACE_PEEKDATA: - case PTRACE_PEEKUSER: - case PTRACE_POKETEXT: - case PTRACE_POKEDATA: - case PTRACE_POKEUSER: - (void) CHECK_1 ((int *) addr); - (void) CHECK_1 ((int *) data); - break; - - case PTRACE_GETREGS: - case PTRACE_SETREGS: -#ifdef __i386__ - (void) CHECK_1 ((struct user_regs_struct *) data); -#else - /* We don't know the size of data, so the best we can do is ensure - that `data' is valid for at least one word. */ - (void) CHECK_1 ((int *) data); -#endif - break; - - case PTRACE_GETFPREGS: - case PTRACE_SETFPREGS: -#ifdef __i386__ - (void) CHECK_1 ((struct user_fpregs_struct *) data); -#else - /* We don't know the size of data, so the best we can do is ensure - that `data' is valid for at least one word. */ - (void) CHECK_1 ((int *) data); -#endif - break; - - case PTRACE_GETFPXREGS: - case PTRACE_SETFPXREGS: -#ifdef __i386__ - (void) CHECK_1 ((struct user_fpxregs_struct *) data); -#else - /* We don't know the size of data, so the best we can do is ensure - that `data' is valid for at least one word. */ - (void) CHECK_1 ((int *) data); -#endif - break; - - case PTRACE_GETSIGINFO: - case PTRACE_SETSIGINFO: - (void) CHECK_1 ((siginfo_t *) data); - break; - - case PTRACE_GETEVENTMSG: - (void) CHECK_1 ((unsigned long *) data); - break; - - case PTRACE_SETOPTIONS: - (void) CHECK_1 ((long *) data); - break; - - case PTRACE_TRACEME: - case PTRACE_CONT: - case PTRACE_KILL: - case PTRACE_SINGLESTEP: - case PTRACE_ATTACH: - case PTRACE_DETACH: - case PTRACE_SYSCALL: - /* Neither `data' nor `addr' needs any checks. */ - break; - }; -#endif - res = INLINE_SYSCALL (ptrace, 4, request, pid, __ptrvalue (addr), __ptrvalue (data)); if (res >= 0 && request > 0 && request < 4) diff --git a/sysdeps/unix/sysv/linux/s390/gettimeofday.c b/sysdeps/unix/sysv/linux/s390/gettimeofday.c index 54c5e1d..22df728 100644 --- a/sysdeps/unix/sysv/linux/s390/gettimeofday.c +++ b/sysdeps/unix/sysv/linux/s390/gettimeofday.c @@ -16,7 +16,6 @@ . */ #include -#include #include #include #include @@ -33,7 +32,7 @@ __gettimeofday (tv, tz) struct timeval *tv; struct timezone *tz; { - return INLINE_VSYSCALL (gettimeofday, 2, CHECK_1 (tv), CHECK_1 (tz)); + return INLINE_VSYSCALL (gettimeofday, 2, tv, tz); } libc_hidden_def (__gettimeofday) weak_alias (__gettimeofday, gettimeofday) diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c index 01dbdd0..10b0ccd 100644 --- a/sysdeps/unix/sysv/linux/shmctl.c +++ b/sysdeps/unix/sysv/linux/shmctl.c @@ -25,7 +25,6 @@ #include #include #include -#include #include @@ -64,8 +63,7 @@ int attribute_compat_text_section __old_shmctl (int shmid, int cmd, struct __old_shmid_ds *buf) { - return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, - cmd, 0, CHECK_1_NULL_OK (buf)); + return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); } compat_symbol (libc, __old_shmctl, shmctl, GLIBC_2_0); #endif @@ -75,7 +73,7 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) { #if __ASSUME_IPC64 > 0 return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd | __IPC_64, 0, - CHECK_1 (buf)); + buf); #else switch (cmd) { case SHM_STAT: @@ -86,8 +84,7 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) #endif break; default: - return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, - CHECK_1 (buf)); + return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); } { @@ -101,7 +98,7 @@ __new_shmctl (int shmid, int cmd, struct shmid_ds *buf) /* Unfortunately there is no way how to find out for sure whether we should use old or new shmctl. */ result = INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd | __IPC_64, 0, - CHECK_1 (buf)); + buf); if (result != -1 || errno != EINVAL) return result; diff --git a/sysdeps/unix/sysv/linux/sigtimedwait.c b/sysdeps/unix/sysv/linux/sigtimedwait.c index df14c2b..20fe355 100644 --- a/sysdeps/unix/sysv/linux/sigtimedwait.c +++ b/sysdeps/unix/sysv/linux/sigtimedwait.c @@ -21,7 +21,6 @@ #include #include -#include #ifdef __NR_rt_sigtimedwait @@ -52,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, set, - CHECK_1 (info), timeout, _NSIG / 8); + info, timeout, _NSIG / 8); /* The kernel generates a SI_TKILL code in si_code in case tkill is used. tkill is transparently used in raise(). Since having diff --git a/sysdeps/unix/sysv/linux/sigwaitinfo.c b/sysdeps/unix/sysv/linux/sigwaitinfo.c index 46afb46..50fa72b 100644 --- a/sysdeps/unix/sysv/linux/sigwaitinfo.c +++ b/sysdeps/unix/sysv/linux/sigwaitinfo.c @@ -23,7 +23,6 @@ #include #include -#include #ifdef __NR_rt_sigtimedwait @@ -53,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, set, - CHECK_1 (info), NULL, _NSIG / 8); + info, NULL, _NSIG / 8); /* The kernel generates a SI_TKILL code in si_code in case tkill is used. tkill is transparently used in raise(). Since having diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c b/sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c index 3bda4b2..d55511e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c @@ -22,7 +22,6 @@ #include #include -#include /* Allows to control internal state and destruction of message queue objects. */ @@ -33,5 +32,5 @@ msgctl (msqid, cmd, buf) int cmd; struct msqid_ds *buf; { - return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, msqid, cmd, 0, CHECK_1 (buf)); + return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, msqid, cmd, 0, buf); } diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c b/sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c index fc25739..7c4af74 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c @@ -22,7 +22,6 @@ #include #include -#include /* Provide operations to control over shared memory segments. */ @@ -32,5 +31,5 @@ shmctl (shmid, cmd, buf) int cmd; struct shmid_ds *buf; { - return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, CHECK_1 (buf)); + return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); } diff --git a/sysdeps/unix/sysv/linux/ustat.c b/sysdeps/unix/sysv/linux/ustat.c index 7a57ee1..499ed7e 100644 --- a/sysdeps/unix/sysv/linux/ustat.c +++ b/sysdeps/unix/sysv/linux/ustat.c @@ -22,7 +22,6 @@ #include #include -#include int ustat (dev_t dev, struct ustat *ubuf) @@ -37,5 +36,5 @@ ustat (dev_t dev, struct ustat *ubuf) return -1; } - return INLINE_SYSCALL (ustat, 2, (unsigned int) k_dev, CHECK_1 (ubuf)); + return INLINE_SYSCALL (ustat, 2, (unsigned int) k_dev, ubuf); } diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fxstat.c b/sysdeps/unix/sysv/linux/wordsize-64/fxstat.c index bbaa0e0..d6023e2 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/fxstat.c +++ b/sysdeps/unix/sysv/linux/wordsize-64/fxstat.c @@ -26,14 +26,13 @@ #include #include -#include /* Get information about the file FD in BUF. */ int __fxstat (int vers, int fd, struct stat *buf) { if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX) - return INLINE_SYSCALL (fstat, 2, fd, CHECK_1 (buf)); + return INLINE_SYSCALL (fstat, 2, fd, buf); __set_errno (EINVAL); return -1; diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c b/sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c index 733348c..73a2e87 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c +++ b/sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c @@ -29,7 +29,6 @@ #include #include #include -#include /* Get information about the file NAME relative to FD in ST. */ @@ -95,9 +94,9 @@ __fxstatat (int vers, int fd, const char *file, struct stat *st, int flag) INTERNAL_SYSCALL_DECL (err); if (flag & AT_SYMLINK_NOFOLLOW) - res = INTERNAL_SYSCALL (lstat, err, 2, file, CHECK_1 (st)); + res = INTERNAL_SYSCALL (lstat, err, 2, file, st); else - res = INTERNAL_SYSCALL (stat, err, 2, file, CHECK_1 (st)); + res = INTERNAL_SYSCALL (stat, err, 2, file, st); if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (res, err), 0)) { diff --git a/sysdeps/unix/sysv/linux/wordsize-64/lxstat.c b/sysdeps/unix/sysv/linux/wordsize-64/lxstat.c index 6a78d6c..62b6c89 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/lxstat.c +++ b/sysdeps/unix/sysv/linux/wordsize-64/lxstat.c @@ -26,14 +26,13 @@ #include #include -#include /* Get information about the file FD in BUF. */ int __lxstat (int vers, const char *name, struct stat *buf) { if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX) - return INLINE_SYSCALL (lstat, 2, name, CHECK_1 (buf)); + return INLINE_SYSCALL (lstat, 2, name, buf); __set_errno (EINVAL); return -1; diff --git a/sysdeps/unix/sysv/linux/wordsize-64/xstat.c b/sysdeps/unix/sysv/linux/wordsize-64/xstat.c index b9b533d..1fa2280 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/xstat.c +++ b/sysdeps/unix/sysv/linux/wordsize-64/xstat.c @@ -26,14 +26,13 @@ #include #include -#include /* Get information about the file NAME in BUF. */ int __xstat (int vers, const char *name, struct stat *buf) { if (vers == _STAT_VER_KERNEL || vers == _STAT_VER_LINUX) - return INLINE_SYSCALL (stat, 2, name, CHECK_1 (buf)); + return INLINE_SYSCALL (stat, 2, name, buf); __set_errno (EINVAL); return -1; diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c index 2cdceb5..2eaf380 100644 --- a/sysdeps/unix/sysv/linux/xstat.c +++ b/sysdeps/unix/sysv/linux/xstat.c @@ -27,7 +27,6 @@ #include #include -#include #include @@ -36,8 +35,7 @@ int __xstat (int vers, const char *name, struct stat *buf) { if (vers == _STAT_VER_KERNEL) - return INLINE_SYSCALL (stat, 2, name, - CHECK_1 ((struct kernel_stat *) buf)); + return INLINE_SYSCALL (stat, 2, name, (struct kernel_stat *) buf); #ifdef STAT_IS_KERNEL_STAT errno = EINVAL; diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c index c9f32cc..2377ac5 100644 --- a/sysdeps/unix/sysv/linux/xstat64.c +++ b/sysdeps/unix/sysv/linux/xstat64.c @@ -23,7 +23,6 @@ #include #include -#include #include @@ -33,7 +32,7 @@ int ___xstat64 (int vers, const char *name, struct stat64 *buf) { int result; - result = INLINE_SYSCALL (stat64, 2, name, CHECK_1 (buf)); + result = INLINE_SYSCALL (stat64, 2, name, buf); #if defined _HAVE_STAT64___ST_INO && __ASSUME_ST_INO_64_BIT == 0 if (__builtin_expect (!result, 1) && buf->__st_ino != (__ino_t) buf->st_ino) buf->st_ino = buf->__st_ino; -- cgit v1.1