mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-29 13:28:19 +00:00
Code Issues Releases Wiki Activity

Add a timeout to work around ptrace(PTRACE_SYSCALL) on a parent attached

Browse Source 
ptrace() call never waking the child process on RHEL5 beta 2. Also did
some minor code formatting cleanup.
This commit is contained in:
Steve Beattie 2007-01-08 12:08:08 +00:00
parent 9d6ce46f3b
commit 57761032f9
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/regression/subdomain/ptrace.c
View File

@ -43,6 +43,13 @@ int do_parent(pid_t pid, int trace, int num_syscall)
{ {
struct user regs; struct user regs;
int status, i; int status, i;
unsigned int rc;
rc = alarm(5);
if (rc != 0) {
fprintf(stderr, "FAIL: unexpected alarm already set\n");
return 0;
}
if (trace) { if (trace) {
if (ptrace(PTRACE_ATTACH, pid, NULL, NULL) == -1) { if (ptrace(PTRACE_ATTACH, pid, NULL, NULL) == -1) {
@ -58,7 +65,7 @@ int do_parent(pid_t pid, int trace, int num_syscall)
if (!WIFSTOPPED(status)) if (!WIFSTOPPED(status))
return interp_status(status); return interp_status(status);
for (i=0;i<num_syscall * 2;i++){ for (i = 0; i < num_syscall * 2; i++){
/* this will restart stopped child */ /* this will restart stopped child */
if (ptrace(PTRACE_SYSCALL, pid, NULL, 0) == -1) { if (ptrace(PTRACE_SYSCALL, pid, NULL, 0) == -1) {
perror("FAIL: parent ptrace(PTRACE_SINGLESTEP) failed - "); perror("FAIL: parent ptrace(PTRACE_SINGLESTEP) failed - ");
@ -115,6 +122,11 @@ int do_child(char *argv[], int child_trace, int helper)
return RET_FAILURE; return RET_FAILURE;
} }
void sigalrm_handler(int sig) {
fprintf(stderr, "FAIL: parent timed out waiting for child\n");
exit(1);
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
pid_t pid; pid_t pid;
@ -122,12 +134,17 @@ int main(int argc, char *argv[])
use_helper = 0, use_helper = 0,
num_syscall = NUM_CHLD_SYSCALLS, num_syscall = NUM_CHLD_SYSCALLS,
opt; opt;
const char *usage="usage: %s [-c] [-n #syscall] program [args ...]\n"; const char *usage = "usage: %s [-c] [-n #syscall] program [args ...]\n";
char **args; char **args;
opterr=0; if (signal(SIGALRM, sigalrm_handler) == SIG_ERR) {
perror ("FAIL - signal failed: ");
return(1);
}
opterr = 0;
while (1) { while (1) {
opt=getopt(argc, argv, "chn:"); opt = getopt(argc, argv, "chn:");
if (opt == -1) if (opt == -1)
break; break;
@ -149,7 +166,7 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
args=&argv[optind]; args = &argv[optind];
pid = fork(); pid = fork();
if (pid > 0){ /*parent */ if (pid > 0){ /*parent */