PATCH: fix misc warnings and runtime bugs in BPs.
Greg McGary
greg@mcgary.org
Sat Jul 15 22:54:00 GMT 2000
2000-07-15 Greg McGary <greg@mcgary.org>
* 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.
Index: sysdeps/generic/strcpy.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/generic/strcpy.c,v
retrieving revision 1.5
diff -u -p -r1.5 strcpy.c
--- strcpy.c 2000/07/07 02:19:04 1.5
+++ strcpy.c 2000/07/16 05:35:31
@@ -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;
}
Index: sysdeps/unix/sysv/linux/execve.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/execve.c,v
retrieving revision 1.6
diff -u -p -r1.6 execve.c
--- execve.c 2000/07/07 02:19:05 1.6
+++ execve.c 2000/07/16 05:35:31
@@ -20,6 +20,7 @@
#include <unistd.h>
#include <sysdep.h>
+#include <alloca.h>
#include <sys/syscall.h>
#include <bp-checks.h>
@@ -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);
}
Index: sysdeps/unix/sysv/linux/getsysstats.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/getsysstats.c,v
retrieving revision 1.13
diff -u -p -r1.13 getsysstats.c
--- getsysstats.c 2000/07/13 09:50:03 1.13
+++ getsysstats.c 2000/07/16 05:35:32
@@ -79,7 +79,7 @@ get_proc_path (char *buffer, size_t bufs
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
Index: sysdeps/unix/sysv/linux/ptrace.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/ptrace.c,v
retrieving revision 1.9
diff -u -p -r1.9 ptrace.c
--- ptrace.c 2000/07/11 19:30:53 1.9
+++ ptrace.c 2000/07/16 05:35:32
@@ -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
More information about the Libc-hacker
mailing list