From 14fa17ccec369589c6578af5b6a97b1353d73227 Mon Sep 17 00:00:00 2001 From: Greg McGary Date: Mon, 17 Jul 2000 22:31:56 +0000 Subject: * libio/iofdopen.c (_IO_new_fdopen): Pass _IO_FILE_plus pointer to _IO_file_attach. * libio/iovdprintf.c (_IO_vdprintf): Likewise. * sysdeps/generic/strcpy.c (strcpy): Stifle unused-value warnings. * sysdeps/unix/sysv/linux/execve.c (__execve): Add const qualifiers. Don't check NULL-terminator of argv & envp. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Use unbounded pointer type in word-size assertion. * sysdeps/unix/sysv/linux/ptrace.c (ptrace): Add missing cases to stifle warnings. * libio/iofdopen.c (_IO_new_fdopen): Pass _IO_FILE_plus pointer to _IO_file_attach. * libio/iovdprintf.c (_IO_vdprintf): Likewise. --- sysdeps/generic/strcpy.c | 4 ++-- sysdeps/unix/sysv/linux/execve.c | 9 ++++++--- sysdeps/unix/sysv/linux/getsysstats.c | 2 +- sysdeps/unix/sysv/linux/ptrace.c | 10 ++++++++++ 4 files changed, 19 insertions(+), 6 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/generic/strcpy.c b/sysdeps/generic/strcpy.c index 2317eba65c..c8e28c5532 100644 --- a/sysdeps/generic/strcpy.c +++ b/sysdeps/generic/strcpy.c @@ -42,8 +42,8 @@ strcpy (dest, src) while (c != '\0'); n = s - src; - CHECK_BOUNDS_HIGH (src + n); - CHECK_BOUNDS_HIGH (dest + n); + (void) CHECK_BOUNDS_HIGH (src + n); + (void) CHECK_BOUNDS_HIGH (dest + n); return dest; } diff --git a/sysdeps/unix/sysv/linux/execve.c b/sysdeps/unix/sysv/linux/execve.c index 31277d040e..bec268f492 100644 --- a/sysdeps/unix/sysv/linux/execve.c +++ b/sysdeps/unix/sysv/linux/execve.c @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -41,7 +42,7 @@ __execve (file, argv, envp) __pthread_kill_other_threads_np (); #if __BOUNDED_POINTERS__ { - char **v; + char *const *v; int i; char *__unbounded *__unbounded ubp_argv; char *__unbounded *__unbounded ubp_envp; @@ -51,15 +52,17 @@ __execve (file, argv, envp) ; i = v - argv + 1; ubp_argv = (char *__unbounded *__unbounded) alloca (sizeof (*ubp_argv) * i); - for (v = argv, ubp_v = ubp_argv; i--; v++, ubp_v++) + for (v = argv, ubp_v = ubp_argv; --i; v++, ubp_v++) *ubp_v = CHECK_STRING (*v); + *ubp_v = 0; for (v = envp; *v; v++) ; i = v - envp + 1; ubp_envp = (char *__unbounded *__unbounded) alloca (sizeof (*ubp_envp) * i); - for (v = envp, ubp_v = ubp_envp; i--; v++, ubp_v++) + for (v = envp, ubp_v = ubp_envp; --i; v++, ubp_v++) *ubp_v = CHECK_STRING (*v); + *ubp_v = 0; return INLINE_SYSCALL (execve, 3, CHECK_STRING (file), ubp_argv, ubp_envp); } diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c index a4113ce661..dce568c417 100644 --- a/sysdeps/unix/sysv/linux/getsysstats.c +++ b/sysdeps/unix/sysv/linux/getsysstats.c @@ -79,7 +79,7 @@ get_proc_path (char *buffer, size_t bufsize) return result; /* Now store the copied value. But do it atomically. */ - assert (sizeof (long int) == sizeof (void *)); + assert (sizeof (long int) == sizeof (void *__unbounded)); if (compare_and_swap ((long int *) &mount_proc, (long int) 0, (long int) copy_result) == 0) /* Replacing the value failed. This means another thread was diff --git a/sysdeps/unix/sysv/linux/ptrace.c b/sysdeps/unix/sysv/linux/ptrace.c index 07d8795953..c0792a1761 100644 --- a/sysdeps/unix/sysv/linux/ptrace.c +++ b/sysdeps/unix/sysv/linux/ptrace.c @@ -91,6 +91,16 @@ ptrace (enum __ptrace_request request, ...) (void) CHECK_1 ((int *) data); #endif 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 -- cgit 1.4.1