Menu
▾
▴
audit-test-developer — Communicate about status of bugs, patches, and features
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(8) |
Feb
(23) |
Mar
(11) |
Apr
(8) |
May
(2) |
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(23) |
Mar
(140) |
Apr
(35) |
May
(49) |
Jun
(176) |
Jul
(73) |
Aug
(50) |
Sep
(78) |
Oct
(102) |
Nov
(150) |
Dec
(94) |
| 2012 |
Jan
(120) |
Feb
(77) |
Mar
(29) |
Apr
(4) |
May
(19) |
Jun
|
Jul
(19) |
Aug
(9) |
Sep
|
Oct
(6) |
Nov
(3) |
Dec
|
| 2013 |
Jan
(4) |
Feb
(28) |
Mar
(5) |
Apr
(69) |
May
(34) |
Jun
(11) |
Jul
(13) |
Aug
(55) |
Sep
(5) |
Oct
(31) |
Nov
|
Dec
(25) |
| 2014 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(53) |
Aug
(17) |
Sep
(50) |
Oct
(15) |
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(3) |
Apr
(9) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(8) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:46:03
|
These variables don't seem to be used anywhere in the suite. Signed-off-by: Jiri Jaburek <jja...@re...> --- audit-test/rules.mk | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/audit-test/rules.mk b/audit-test/rules.mk index bf32746..fd18e0f 100644 --- a/audit-test/rules.mk +++ b/audit-test/rules.mk @@ -314,23 +314,3 @@ subdirs_quiet: @for x in $(SUB_DIRS); do \ $(MAKE) --no-print-directory -C $$x $(MAKECMDGOALS) || exit $$?; \ done - -########################################################################## -# Command framework execution rules -########################################################################## - -ifneq ($(DEBUG),) -DEBUG_ARG = -d $(DEBUG) -endif - -ifneq ($(TEST_USER),) -USER_ARG = -u $(TEST_USER) -endif - -ifneq ($(LOGIN_USER),) -LOGIN_ARG = -l $(LOGIN_USER) -endif - -ifneq ($(TEST),) -TEST_ARG = -t $(TEST) -endif -- 1.8.3.1 |
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:46:00
|
This target was inconsistent across buckets (supported only by two) and likely unused. Use 'make clean' or 'make distclean' instead. Signed-off-by: Jiri Jaburek <jja...@re...> --- audit-test/rules.mk | 2 +- audit-test/utils/bin/Makefile | 3 --- audit-test/utils/network-server/Makefile | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/audit-test/rules.mk b/audit-test/rules.mk index 22af9d3..bf32746 100644 --- a/audit-test/rules.mk +++ b/audit-test/rules.mk @@ -102,7 +102,7 @@ endif ########################################################################## .PHONY: all run \ - clean clobber distclean _clean _clobber _distclean \ + clean distclean _clean _distclean \ msgque rmlogs showrpms showrpms2 all: deps subdirs $(ALL_AR) $(ALL_EXE) $(ALL_SO) diff --git a/audit-test/utils/bin/Makefile b/audit-test/utils/bin/Makefile index aeaa493..397cb32 100644 --- a/audit-test/utils/bin/Makefile +++ b/audit-test/utils/bin/Makefile @@ -208,6 +208,3 @@ endif $(RT_EXE): LDLIBS += -lrt all: $(ALL_EXE) - -clobber: - $(RM) $(ALL_EXE) diff --git a/audit-test/utils/network-server/Makefile b/audit-test/utils/network-server/Makefile index 98478d2..9306c94 100644 --- a/audit-test/utils/network-server/Makefile +++ b/audit-test/utils/network-server/Makefile @@ -30,6 +30,3 @@ all: $(ALL_EXE) install: $(SRVR_EXE) install -o root -g root -m 0644 lblnet_tst-tcp /etc/xinetd.d - -clobber: - $(RM) $(ALL_EXE) -- 1.8.3.1 |
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:57
|
(use stdout for syscall-specific output)
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/netfilebt/run.conf | 2 +-
audit-test/netfilter/run.conf | 2 +-
audit-test/network/run.conf | 2 +-
audit-test/syscalls/run.conf | 2 +-
audit-test/syscalls/syscall_functions.bash | 26 +++++++++++++-------------
audit-test/utils/bin/do_accept.c | 2 +-
audit-test/utils/bin/do_accept4.c | 2 +-
audit-test/utils/bin/do_access.c | 2 +-
audit-test/utils/bin/do_acct.c | 2 +-
audit-test/utils/bin/do_adjtimex.c | 2 +-
audit-test/utils/bin/do_bind.c | 2 +-
audit-test/utils/bin/do_capset.c | 2 +-
audit-test/utils/bin/do_chdir.c | 2 +-
audit-test/utils/bin/do_chmod.c | 2 +-
audit-test/utils/bin/do_chown.c | 2 +-
audit-test/utils/bin/do_chown32.c | 2 +-
audit-test/utils/bin/do_clock_settime.c | 2 +-
audit-test/utils/bin/do_clone.c | 2 +-
audit-test/utils/bin/do_clone2.c | 2 +-
audit-test/utils/bin/do_connect.c | 2 +-
audit-test/utils/bin/do_creat.c | 2 +-
audit-test/utils/bin/do_delete_module.c | 2 +-
audit-test/utils/bin/do_execve.c | 2 +-
audit-test/utils/bin/do_fchmod.c | 2 +-
audit-test/utils/bin/do_fchmodat.c | 2 +-
audit-test/utils/bin/do_fchown.c | 2 +-
audit-test/utils/bin/do_fchown32.c | 2 +-
audit-test/utils/bin/do_fchownat.c | 2 +-
audit-test/utils/bin/do_fork.c | 2 +-
audit-test/utils/bin/do_fremovexattr.c | 2 +-
audit-test/utils/bin/do_fsetxattr.c | 2 +-
audit-test/utils/bin/do_getseconds.c | 1 +
audit-test/utils/bin/do_gettimezone.c | 3 ++-
audit-test/utils/bin/do_getxattr.c | 2 +-
audit-test/utils/bin/do_init_module.c | 2 +-
audit-test/utils/bin/do_ioctl.c | 2 +-
audit-test/utils/bin/do_ioperm.c | 2 +-
audit-test/utils/bin/do_iopl.c | 2 +-
audit-test/utils/bin/do_ipc.c | 2 +-
audit-test/utils/bin/do_kill.c | 2 +-
audit-test/utils/bin/do_lchown.c | 2 +-
audit-test/utils/bin/do_lchown32.c | 2 +-
audit-test/utils/bin/do_lgetxattr.c | 2 +-
audit-test/utils/bin/do_link.c | 2 +-
audit-test/utils/bin/do_linkat.c | 2 +-
audit-test/utils/bin/do_listxattr.c | 2 +-
audit-test/utils/bin/do_llistxattr.c | 2 +-
audit-test/utils/bin/do_lremovexattr.c | 2 +-
audit-test/utils/bin/do_lsetxattr.c | 2 +-
audit-test/utils/bin/do_mkdir.c | 2 +-
audit-test/utils/bin/do_mkdirat.c | 2 +-
audit-test/utils/bin/do_mknod.c | 2 +-
audit-test/utils/bin/do_mknodat.c | 2 +-
audit-test/utils/bin/do_mmap2.c | 6 +++---
audit-test/utils/bin/do_mount.c | 2 +-
audit-test/utils/bin/do_mq_open.c | 2 +-
audit-test/utils/bin/do_mq_unlink.c | 2 +-
audit-test/utils/bin/do_msgctl.c | 2 +-
audit-test/utils/bin/do_msgget.c | 2 +-
audit-test/utils/bin/do_msgrcv.c | 2 +-
audit-test/utils/bin/do_msgsnd.c | 2 +-
audit-test/utils/bin/do_open.c | 2 +-
audit-test/utils/bin/do_openat.c | 2 +-
audit-test/utils/bin/do_ptrace.c | 2 +-
audit-test/utils/bin/do_read.c | 2 +-
audit-test/utils/bin/do_readlink.c | 2 +-
audit-test/utils/bin/do_readlinkat.c | 2 +-
audit-test/utils/bin/do_recvfrom.c | 2 +-
audit-test/utils/bin/do_recvmmsg.c | 2 +-
audit-test/utils/bin/do_recvmsg.c | 2 +-
audit-test/utils/bin/do_removexattr.c | 2 +-
audit-test/utils/bin/do_rename.c | 2 +-
audit-test/utils/bin/do_renameat.c | 2 +-
audit-test/utils/bin/do_rmdir.c | 2 +-
audit-test/utils/bin/do_semctl.c | 2 +-
audit-test/utils/bin/do_semget.c | 2 +-
audit-test/utils/bin/do_semop.c | 2 +-
audit-test/utils/bin/do_semtimedop.c | 2 +-
audit-test/utils/bin/do_send.c | 2 +-
audit-test/utils/bin/do_sendmsg.c | 2 +-
audit-test/utils/bin/do_sendto.c | 2 +-
audit-test/utils/bin/do_setfsgid.c | 2 +-
audit-test/utils/bin/do_setfsgid32.c | 2 +-
audit-test/utils/bin/do_setfsuid.c | 2 +-
audit-test/utils/bin/do_setfsuid32.c | 2 +-
audit-test/utils/bin/do_setgid.c | 2 +-
audit-test/utils/bin/do_setgid32.c | 2 +-
audit-test/utils/bin/do_setgroups.c | 2 +-
audit-test/utils/bin/do_setgroups32.c | 2 +-
audit-test/utils/bin/do_setregid.c | 2 +-
audit-test/utils/bin/do_setregid32.c | 2 +-
audit-test/utils/bin/do_setresgid.c | 2 +-
audit-test/utils/bin/do_setresgid32.c | 2 +-
audit-test/utils/bin/do_setresuid.c | 2 +-
audit-test/utils/bin/do_setresuid32.c | 2 +-
audit-test/utils/bin/do_setreuid.c | 2 +-
audit-test/utils/bin/do_setreuid32.c | 2 +-
audit-test/utils/bin/do_settimeofday.c | 2 +-
audit-test/utils/bin/do_setuid.c | 2 +-
audit-test/utils/bin/do_setuid32.c | 2 +-
audit-test/utils/bin/do_setxattr.c | 2 +-
audit-test/utils/bin/do_shmat.c | 2 +-
audit-test/utils/bin/do_shmctl.c | 2 +-
audit-test/utils/bin/do_shmget.c | 2 +-
audit-test/utils/bin/do_socketcall.c | 2 +-
audit-test/utils/bin/do_stime.c | 2 +-
audit-test/utils/bin/do_swapon.c | 2 +-
audit-test/utils/bin/do_symlink.c | 2 +-
audit-test/utils/bin/do_symlinkat.c | 2 +-
audit-test/utils/bin/do_tgkill.c | 2 +-
audit-test/utils/bin/do_tkill.c | 2 +-
audit-test/utils/bin/do_truncate.c | 2 +-
audit-test/utils/bin/do_truncate64.c | 2 +-
audit-test/utils/bin/do_umask.c | 2 +-
audit-test/utils/bin/do_unlink.c | 2 +-
audit-test/utils/bin/do_unlinkat.c | 2 +-
audit-test/utils/bin/do_uselib.c | 2 +-
audit-test/utils/bin/do_utime.c | 2 +-
audit-test/utils/bin/do_utimensat.c | 2 +-
audit-test/utils/bin/do_utimes.c | 2 +-
audit-test/utils/bin/do_vfork.c | 2 +-
121 files changed, 136 insertions(+), 134 deletions(-)
diff --git a/audit-test/netfilebt/run.conf b/audit-test/netfilebt/run.conf
index 93b9d93..3ecc41e 100644
--- a/audit-test/netfilebt/run.conf
+++ b/audit-test/netfilebt/run.conf
@@ -722,7 +722,7 @@ function run_test {
# run the test itself
read testres exitval pid <<< \
"$(runcon -t $test_domain -l $(get_label_subj $mlsop) \
- do_$tst_name "${tst_args[@]}")"
+ do_$tst_name "${tst_args[@]}" 2>&1 1>/dev/null)"
echo "testres is "$testres" and exitval is "$exitval" "
[[ -z $testres || -z $exitval || -z $pid ]] && exit_error
diff --git a/audit-test/netfilter/run.conf b/audit-test/netfilter/run.conf
index 8d86097..d9b6f06 100644
--- a/audit-test/netfilter/run.conf
+++ b/audit-test/netfilter/run.conf
@@ -945,7 +945,7 @@ function run_test {
*)
read testres exitval pid <<< \
"$(runcon -t $test_domain -l $(get_label_subj $mlsop) \
- do_$tst_name "${tst_args[@]}")"
+ do_$tst_name "${tst_args[@]}" 2>&1 1>/dev/null)"
;;
esac
diff --git a/audit-test/network/run.conf b/audit-test/network/run.conf
index 0a88e17..f59aa02 100644
--- a/audit-test/network/run.conf
+++ b/audit-test/network/run.conf
@@ -933,7 +933,7 @@ function run_test {
# run the test itself
read testres exitval pid <<< \
"$(runcon -u system_u -r system_r -t $test_domain -l $(get_label_subj $mlsop) -- \
- do_$tst_name "${tst_args[@]}")"
+ do_$tst_name "${tst_args[@]}" 2>&1 1>/dev/null)"
[[ -z $testres || -z $exitval || -z $pid ]] && exit_error
check_result $expres $testres $exitval $err
diff --git a/audit-test/syscalls/run.conf b/audit-test/syscalls/run.conf
index b3af7c4..0f22382 100644
--- a/audit-test/syscalls/run.conf
+++ b/audit-test/syscalls/run.conf
@@ -135,7 +135,7 @@ function run_test {
test_runcon_default
else
read testres exitval pid \
- <<<"$(do_$syscall $op $dirname $source $target $flag)"
+ <<<"$(do_$syscall $op $dirname $source $target $flag 2>&1 1>/dev/null)"
fi
[[ -z $testres || -z $exitval || -z $pid ]] && exit_error
diff --git a/audit-test/syscalls/syscall_functions.bash b/audit-test/syscalls/syscall_functions.bash
index bd38b40..cbaed4f 100644
--- a/audit-test/syscalls/syscall_functions.bash
+++ b/audit-test/syscalls/syscall_functions.bash
@@ -96,7 +96,7 @@ function test_su_default {
# do the test
[[ -z $user ]] && exit_error "test \$user undefined"
if [[ $user == super ]]; then
- read testres exitval pid <<<"$(do_$syscall "$@")"
+ read testres exitval pid <<<"$(do_$syscall "$@" 2>&1 1>/dev/null)"
else
if [[ $user == "test" ]]; then
testuser=$TEST_USER
@@ -109,7 +109,7 @@ function test_su_default {
read uid euid suid fsuid gid egid sgid fsgid \
<<<"$(/bin/su - $testuser -c 'ps --no-headers -p $$ -o uid,euid,suid,fsuid,gid,egid,sgid,fsgid')"
read testres exitval pid \
- <<<"$(/bin/su - $testuser -c "$(which do_$syscall) $testargs")"
+ <<<"$(/bin/su - $testuser -c "$(which do_$syscall) $testargs 2>&1 1>/dev/null")"
fi
}
@@ -121,7 +121,7 @@ function test_su_fork {
saved=$(ulimit -u)
prepend_cleanup "ulimit -u $saved"
ulimit -u 2
- read testres exitval pid <<<"$(do_$syscall)"
+ read testres exitval pid <<<"$(do_$syscall 2>&1 1>/dev/null)"
else
if [[ $user == "test" ]]; then
testuser=$TEST_USER
@@ -133,7 +133,7 @@ function test_su_fork {
read uid euid suid fsuid gid egid sgid fsgid \
<<<"$(/bin/su - $testuser -c 'ps --no-headers -p $$ -o uid,euid,suid,fsuid,gid,egid,sgid,fsgid')"
read testres exitval pid \
- <<<"$(/bin/su - $testuser -c "ulimit -u 2 ; $(which do_$syscall)")"
+ <<<"$(/bin/su - $testuser -c "ulimit -u 2 ; $(which do_$syscall) 2>&1 1>/dev/null")"
fi
}
@@ -163,15 +163,15 @@ function test_su_time_zone {
function test_runcon_default {
read testres exitval pid \
- <<<"$(runcon $subj do_$syscall $op $dirname $source $target $flag $setcontext)"
+ <<<"$(runcon $subj do_$syscall $op $dirname $source $target $flag $setcontext 2>&1 1>/dev/null)"
}
function test_runcon_kill_pgrp {
- read testres exitval pid <<<"$(runcon $subj do_$syscall $target $flag group)"
+ read testres exitval pid <<<"$(runcon $subj do_$syscall $target $flag group 2>&1 1>/dev/null)"
}
function test_runcon_msg_send {
- read testres exitval pid <<<"$(runcon $subj do_$syscall $op $target $flag "$msg")"
+ read testres exitval pid <<<"$(runcon $subj do_$syscall $op $target $flag "$msg" 2>&1 1>/dev/null)"
}
######################################################################
@@ -492,7 +492,7 @@ function create_msg_id {
eval "$(parse_named "$@")" || exit_error
prepend_cleanup "ipcrm -Q $ipc_key"
- read result id foo <<<"$(${context:+runcon $context} $(which do_msgget) $ipc_key create)"
+ read result id foo <<<"$(${context:+runcon $context} $(which do_msgget) $ipc_key create 2>&1 1>/dev/null)"
[[ $result == 0 ]] || exit_error "could not create message queue"
eval "$var=\$id"
@@ -516,7 +516,7 @@ function create_sem_id {
eval "$(parse_named "$@")" || exit_error
prepend_cleanup "ipcrm -S $ipc_key"
- read result id foo <<<"$(${context:+runcon $context} $(which do_semget) $ipc_key create)"
+ read result id foo <<<"$(${context:+runcon $context} $(which do_semget) $ipc_key create 2>&1 1>/dev/null)"
[[ $result == 0 ]] || exit_error "could not create semaphore set"
eval "$var=\$id"
@@ -540,7 +540,7 @@ function create_shm_id {
eval "$(parse_named "$@")" || exit_error
prepend_cleanup "ipcrm -M $ipc_key"
- read result id foo <<<"$(${context:+runcon $context} $(which do_shmget) $ipc_key create)"
+ read result id foo <<<"$(${context:+runcon $context} $(which do_shmget) $ipc_key create 2>&1 1>/dev/null)"
[[ $result == 0 ]] || exit_error "could not create shared memory segment"
eval "$var=\$id"
@@ -783,7 +783,7 @@ function create_fs_objects_dac {
value="text/plain"
if [[ $action == remove ]]; then
read result foo bar \
- <<<"$(do_setxattr $target $flag "$value")"
+ <<<"$(do_setxattr $target $flag "$value" 2>&1 1>/dev/null)"
[[ $result == 0 ]] || exit_error "could not initialize xattr"
fi
;;
@@ -872,7 +872,7 @@ function create_ipc_objects_dac {
# do_ipc utility purely because the harness wants to find a
# do_$syscall binary.
read result foo bar \
- <<<"$(do_msgsnd $target $flag 'test message')"
+ <<<"$(do_msgsnd $target $flag 'test message' 2>&1 1>/dev/null)"
[[ $result == 0 ]] || exit_error "could not send initial message" ;;
esac
@@ -1063,7 +1063,7 @@ function create_ipc_objects_mac {
# do_ipc utility purely because the harness wants to find a
# do_$syscall binary.
read result foo bar \
- <<<"$(runcon $obj do_msgsnd $target $flag 'test message')"
+ <<<"$(runcon $obj do_msgsnd $target $flag 'test message' 2>&1 1>/dev/null)"
[[ $result == 0 ]] || exit_error "could not send initial message" ;;
esac
diff --git a/audit-test/utils/bin/do_accept.c b/audit-test/utils/bin/do_accept.c
index f96ffa2..c0c80b2 100644
--- a/audit-test/utils/bin/do_accept.c
+++ b/audit-test/utils/bin/do_accept.c
@@ -70,6 +70,6 @@ int main(int argc, char **argv)
rc = accept(sock, NULL, 0);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
- printf("%d %d %d\n", result, result ? errno : rc, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : rc, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_accept4.c b/audit-test/utils/bin/do_accept4.c
index cf8323d..e32fb0a 100644
--- a/audit-test/utils/bin/do_accept4.c
+++ b/audit-test/utils/bin/do_accept4.c
@@ -70,6 +70,6 @@ int main(int argc, char **argv)
rc = accept4(sock, NULL, 0, 0);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
- printf("%d %d %d\n", result, result ? errno : rc, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : rc, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_access.c b/audit-test/utils/bin/do_access.c
index 1a8fffd..4268030 100644
--- a/audit-test/utils/bin/do_access.c
+++ b/audit-test/utils/bin/do_access.c
@@ -28,6 +28,6 @@ int main(int argc, char **argv)
exitval = access(argv[1], W_OK);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_acct.c b/audit-test/utils/bin/do_acct.c
index eda3715..0c9dde6 100644
--- a/audit-test/utils/bin/do_acct.c
+++ b/audit-test/utils/bin/do_acct.c
@@ -27,6 +27,6 @@ int main(int argc, char **argv)
exitval = acct(filename);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_adjtimex.c b/audit-test/utils/bin/do_adjtimex.c
index a627269..9101acb 100644
--- a/audit-test/utils/bin/do_adjtimex.c
+++ b/audit-test/utils/bin/do_adjtimex.c
@@ -39,6 +39,6 @@ int main(int argc, char **argv)
exitval = adjtimex(&timex);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_bind.c b/audit-test/utils/bin/do_bind.c
index f6bfe75..0b87d01 100644
--- a/audit-test/utils/bin/do_bind.c
+++ b/audit-test/utils/bin/do_bind.c
@@ -66,6 +66,6 @@ int main(int argc, char **argv)
exitval = bind(sockfd, (struct sockaddr *)&addr, addrlen);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_capset.c b/audit-test/utils/bin/do_capset.c
index bffb451..e5176ab 100644
--- a/audit-test/utils/bin/do_capset.c
+++ b/audit-test/utils/bin/do_capset.c
@@ -58,7 +58,7 @@ int main(int argc, char **argv)
cap_free(caps);
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_chdir.c b/audit-test/utils/bin/do_chdir.c
index b54a48d..13cf6bb 100644
--- a/audit-test/utils/bin/do_chdir.c
+++ b/audit-test/utils/bin/do_chdir.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = chdir(argv[1]);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_chmod.c b/audit-test/utils/bin/do_chmod.c
index 4d870d2..114ce86 100644
--- a/audit-test/utils/bin/do_chmod.c
+++ b/audit-test/utils/bin/do_chmod.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = chmod(argv[1], atoi(argv[2]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_chown.c b/audit-test/utils/bin/do_chown.c
index 0bb1b91..bc6ecce 100644
--- a/audit-test/utils/bin/do_chown.c
+++ b/audit-test/utils/bin/do_chown.c
@@ -74,6 +74,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_chown, argv[1], uid, gid);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_chown32.c b/audit-test/utils/bin/do_chown32.c
index 01895dd..4eaf1b7 100644
--- a/audit-test/utils/bin/do_chown32.c
+++ b/audit-test/utils/bin/do_chown32.c
@@ -37,6 +37,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_chown32, argv[1], pw->pw_uid, -1);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_clock_settime.c b/audit-test/utils/bin/do_clock_settime.c
index 164efe0..6670162 100644
--- a/audit-test/utils/bin/do_clock_settime.c
+++ b/audit-test/utils/bin/do_clock_settime.c
@@ -33,6 +33,6 @@ int main(int argc, char **argv)
exitval = clock_settime(CLOCK_REALTIME, &tspec);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_clone.c b/audit-test/utils/bin/do_clone.c
index fa89ba8..e723639 100644
--- a/audit-test/utils/bin/do_clone.c
+++ b/audit-test/utils/bin/do_clone.c
@@ -50,6 +50,6 @@ int main(int argc, char **argv)
exitval = pid;
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_clone2.c b/audit-test/utils/bin/do_clone2.c
index 503e254..c2304cb 100644
--- a/audit-test/utils/bin/do_clone2.c
+++ b/audit-test/utils/bin/do_clone2.c
@@ -56,6 +56,6 @@ int main(int argc, char **argv)
exitval = pid;
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_connect.c b/audit-test/utils/bin/do_connect.c
index d88c058..4b86fed 100644
--- a/audit-test/utils/bin/do_connect.c
+++ b/audit-test/utils/bin/do_connect.c
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
rc = connect(sock, host->ai_addr, host->ai_addrlen);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
- printf("%d %d %d\n", result, result ? errno : rc, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : rc, getpid());
shutdown(sock, SHUT_RDWR);
close(sock);
diff --git a/audit-test/utils/bin/do_creat.c b/audit-test/utils/bin/do_creat.c
index 81b0686..6edb8ec 100644
--- a/audit-test/utils/bin/do_creat.c
+++ b/audit-test/utils/bin/do_creat.c
@@ -38,6 +38,6 @@ int main(int argc, char **argv)
exitval = creat(argv[1], S_IRWXU);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_delete_module.c b/audit-test/utils/bin/do_delete_module.c
index 7f1a8ea..9d3a784 100644
--- a/audit-test/utils/bin/do_delete_module.c
+++ b/audit-test/utils/bin/do_delete_module.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_delete_module, argv[1], 0);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_execve.c b/audit-test/utils/bin/do_execve.c
index c78d24a..a75b4ad 100644
--- a/audit-test/utils/bin/do_execve.c
+++ b/audit-test/utils/bin/do_execve.c
@@ -46,6 +46,6 @@ int main(int argc, char **argv)
error = WIFEXITED(status) ? WEXITSTATUS(status) : EINTR;
result = !!error;
- printf("%d %d %d\n", result, result ? error : 0, pid);
+ fprintf(stderr, "%d %d %d\n", result, result ? error : 0, pid);
return result;
}
diff --git a/audit-test/utils/bin/do_fchmod.c b/audit-test/utils/bin/do_fchmod.c
index e4d911f..f3f07e1 100644
--- a/audit-test/utils/bin/do_fchmod.c
+++ b/audit-test/utils/bin/do_fchmod.c
@@ -36,6 +36,6 @@ int main(int argc, char **argv)
exitval = fchmod(fd, atoi(argv[2]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_fchmodat.c b/audit-test/utils/bin/do_fchmodat.c
index 006cf50..bd61ad1 100644
--- a/audit-test/utils/bin/do_fchmodat.c
+++ b/audit-test/utils/bin/do_fchmodat.c
@@ -40,6 +40,6 @@ int main(int argc, char **argv)
exitval = fchmodat(dir_fd, argv[2], atoi(argv[3]), 0);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_fchown.c b/audit-test/utils/bin/do_fchown.c
index 179d89d..d9403a9 100644
--- a/audit-test/utils/bin/do_fchown.c
+++ b/audit-test/utils/bin/do_fchown.c
@@ -45,6 +45,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_fchown, fd, pw->pw_uid, -1);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_fchown32.c b/audit-test/utils/bin/do_fchown32.c
index d83c169..f2f7163 100644
--- a/audit-test/utils/bin/do_fchown32.c
+++ b/audit-test/utils/bin/do_fchown32.c
@@ -45,6 +45,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_fchown32, fd, pw->pw_uid, -1);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_fchownat.c b/audit-test/utils/bin/do_fchownat.c
index 5eb16ae..cbea54d 100644
--- a/audit-test/utils/bin/do_fchownat.c
+++ b/audit-test/utils/bin/do_fchownat.c
@@ -48,6 +48,6 @@ int main(int argc, char **argv)
exitval = fchownat(dir_fd, argv[2], pw->pw_uid, -1, 0);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_fork.c b/audit-test/utils/bin/do_fork.c
index 991fded..62bc58b 100644
--- a/audit-test/utils/bin/do_fork.c
+++ b/audit-test/utils/bin/do_fork.c
@@ -36,6 +36,6 @@ int main(int argc, char **argv)
exitval = pid;
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_fremovexattr.c b/audit-test/utils/bin/do_fremovexattr.c
index 37224ec..ecbe1c7 100644
--- a/audit-test/utils/bin/do_fremovexattr.c
+++ b/audit-test/utils/bin/do_fremovexattr.c
@@ -37,6 +37,6 @@ int main(int argc, char **argv)
exitval = fremovexattr(fd, argv[2]);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_fsetxattr.c b/audit-test/utils/bin/do_fsetxattr.c
index 65c2c86..ee4bc10 100644
--- a/audit-test/utils/bin/do_fsetxattr.c
+++ b/audit-test/utils/bin/do_fsetxattr.c
@@ -37,6 +37,6 @@ int main(int argc, char **argv)
exitval = fsetxattr(fd, argv[2], argv[3], strlen(argv[3]), XATTR_CREATE);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_getseconds.c b/audit-test/utils/bin/do_getseconds.c
index 2ef41d6..cd8dd8d 100644
--- a/audit-test/utils/bin/do_getseconds.c
+++ b/audit-test/utils/bin/do_getseconds.c
@@ -27,5 +27,6 @@ int main(int argc, char **argv)
result = exitval < 0;
printf("%ld\n", tv.tv_sec);
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_gettimezone.c b/audit-test/utils/bin/do_gettimezone.c
index 9076866..5c8c201 100644
--- a/audit-test/utils/bin/do_gettimezone.c
+++ b/audit-test/utils/bin/do_gettimezone.c
@@ -26,6 +26,7 @@ int main(int argc, char **argv)
exitval = gettimeofday(&tv, &tz);
result = exitval < 0;
- printf("%d %d\n", tz.tz_minuteswest, tz.tz_dsttime);
+ fprintf(stderr, "%d %d\n", tz.tz_minuteswest, tz.tz_dsttime);
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_getxattr.c b/audit-test/utils/bin/do_getxattr.c
index 3d680dc..e5396b7 100644
--- a/audit-test/utils/bin/do_getxattr.c
+++ b/audit-test/utils/bin/do_getxattr.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = getxattr(argv[1], argv[2], &buf, 256);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_init_module.c b/audit-test/utils/bin/do_init_module.c
index ba6c3e6..0ac567b 100644
--- a/audit-test/utils/bin/do_init_module.c
+++ b/audit-test/utils/bin/do_init_module.c
@@ -56,6 +56,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_init_module, buffer, mstat.st_size, "");
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_ioctl.c b/audit-test/utils/bin/do_ioctl.c
index 1ddcffd..a675f76 100644
--- a/audit-test/utils/bin/do_ioctl.c
+++ b/audit-test/utils/bin/do_ioctl.c
@@ -52,6 +52,6 @@ int main(int argc, char **argv)
exitval = ioctl(fd, request, arg);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_ioperm.c b/audit-test/utils/bin/do_ioperm.c
index 4388f84..ccb6cec 100644
--- a/audit-test/utils/bin/do_ioperm.c
+++ b/audit-test/utils/bin/do_ioperm.c
@@ -30,6 +30,6 @@ int main(int argc, char **argv)
exitval = ioperm(atoi(argv[1]), atoi(argv[2]), turn_on);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_iopl.c b/audit-test/utils/bin/do_iopl.c
index 42e6cd1..18fa8a4 100644
--- a/audit-test/utils/bin/do_iopl.c
+++ b/audit-test/utils/bin/do_iopl.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = iopl(atoi(argv[1]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_ipc.c b/audit-test/utils/bin/do_ipc.c
index 6d1d7ee..b44c77e 100644
--- a/audit-test/utils/bin/do_ipc.c
+++ b/audit-test/utils/bin/do_ipc.c
@@ -102,6 +102,6 @@ int main(int argc, char **argv)
result = exitval < 0;
}
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_kill.c b/audit-test/utils/bin/do_kill.c
index c811679..dd30828 100644
--- a/audit-test/utils/bin/do_kill.c
+++ b/audit-test/utils/bin/do_kill.c
@@ -56,6 +56,6 @@ int main(int argc, char **argv)
exitval = kill(pid, signum);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_lchown.c b/audit-test/utils/bin/do_lchown.c
index 4585b42..9a8f183 100644
--- a/audit-test/utils/bin/do_lchown.c
+++ b/audit-test/utils/bin/do_lchown.c
@@ -73,6 +73,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_lchown, argv[1], uid, gid);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_lchown32.c b/audit-test/utils/bin/do_lchown32.c
index bdb1459..45d180a 100644
--- a/audit-test/utils/bin/do_lchown32.c
+++ b/audit-test/utils/bin/do_lchown32.c
@@ -37,6 +37,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_lchown32, argv[1], pw->pw_uid, -1);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_lgetxattr.c b/audit-test/utils/bin/do_lgetxattr.c
index 9a74ef3..572472d 100644
--- a/audit-test/utils/bin/do_lgetxattr.c
+++ b/audit-test/utils/bin/do_lgetxattr.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = lgetxattr(argv[1], argv[2], &buf, 256);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_link.c b/audit-test/utils/bin/do_link.c
index 2b848d3..6fb9f23 100644
--- a/audit-test/utils/bin/do_link.c
+++ b/audit-test/utils/bin/do_link.c
@@ -28,6 +28,6 @@ int main(int argc, char **argv)
exitval = link(argv[1], argv[2]);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_linkat.c b/audit-test/utils/bin/do_linkat.c
index 41535b8..cd35f32 100644
--- a/audit-test/utils/bin/do_linkat.c
+++ b/audit-test/utils/bin/do_linkat.c
@@ -55,6 +55,6 @@ int main(int argc, char **argv)
exitval = linkat(dir_fd, argv[2], newdir_fd, argv[3], 0);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_listxattr.c b/audit-test/utils/bin/do_listxattr.c
index 078a327..27741df 100644
--- a/audit-test/utils/bin/do_listxattr.c
+++ b/audit-test/utils/bin/do_listxattr.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = listxattr(argv[1], buf, 1024);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_llistxattr.c b/audit-test/utils/bin/do_llistxattr.c
index 3e1931f..560a14c 100644
--- a/audit-test/utils/bin/do_llistxattr.c
+++ b/audit-test/utils/bin/do_llistxattr.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = llistxattr(argv[1], buf, 1024);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_lremovexattr.c b/audit-test/utils/bin/do_lremovexattr.c
index b3f6bc6..5ed0eaf 100644
--- a/audit-test/utils/bin/do_lremovexattr.c
+++ b/audit-test/utils/bin/do_lremovexattr.c
@@ -30,6 +30,6 @@ int main(int argc, char **argv)
exitval = lremovexattr(argv[1], argv[2]);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_lsetxattr.c b/audit-test/utils/bin/do_lsetxattr.c
index 0f03799..e1d5531 100644
--- a/audit-test/utils/bin/do_lsetxattr.c
+++ b/audit-test/utils/bin/do_lsetxattr.c
@@ -30,6 +30,6 @@ int main(int argc, char **argv)
exitval = lsetxattr(argv[1], argv[2], argv[3], strlen(argv[3]), XATTR_CREATE);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_mkdir.c b/audit-test/utils/bin/do_mkdir.c
index d601903..0b797b6 100644
--- a/audit-test/utils/bin/do_mkdir.c
+++ b/audit-test/utils/bin/do_mkdir.c
@@ -38,6 +38,6 @@ int main(int argc, char **argv)
exitval = mkdir(argv[1], S_IRWXU);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_mkdirat.c b/audit-test/utils/bin/do_mkdirat.c
index a3fe48f..4812cd2 100644
--- a/audit-test/utils/bin/do_mkdirat.c
+++ b/audit-test/utils/bin/do_mkdirat.c
@@ -49,6 +49,6 @@ int main(int argc, char **argv)
exitval = mkdirat(dir_fd, argv[2], S_IRWXU);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_mknod.c b/audit-test/utils/bin/do_mknod.c
index c12c76d..eb25ac4 100644
--- a/audit-test/utils/bin/do_mknod.c
+++ b/audit-test/utils/bin/do_mknod.c
@@ -38,6 +38,6 @@ int main(int argc, char **argv)
exitval = mknod(argv[1], S_IRWXU, S_IFBLK);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_mknodat.c b/audit-test/utils/bin/do_mknodat.c
index d6f5f47..d7251a1 100644
--- a/audit-test/utils/bin/do_mknodat.c
+++ b/audit-test/utils/bin/do_mknodat.c
@@ -49,6 +49,6 @@ int main(int argc, char **argv)
exitval = mknodat(dir_fd, argv[2], S_IRWXU, S_IFBLK);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_mmap2.c b/audit-test/utils/bin/do_mmap2.c
index 8d24bb7..22b8047 100644
--- a/audit-test/utils/bin/do_mmap2.c
+++ b/audit-test/utils/bin/do_mmap2.c
@@ -91,12 +91,12 @@ int main(int argc, char **argv)
if (addr == MAP_FAILED) {
result = TEST_FAIL;
- printf("%d %d %d\n", result, errno, getpid());
+ fprintf(stderr, "%d %d %d\n", result, errno, getpid());
} else {
#if defined(PPC64) || defined(I686)
- printf("%d %d %d\n", result, (int) addr, getpid());
+ fprintf(stderr, "%d %d %d\n", result, (int) addr, getpid());
#else
- printf("%d %lu %d\n", result, (unsigned long) addr, getpid());
+ fprintf(stderr, "%d %lu %d\n", result, (unsigned long) addr, getpid());
#endif
}
diff --git a/audit-test/utils/bin/do_mount.c b/audit-test/utils/bin/do_mount.c
index f66ab8a..78228aa 100644
--- a/audit-test/utils/bin/do_mount.c
+++ b/audit-test/utils/bin/do_mount.c
@@ -51,6 +51,6 @@ int main(int argc, char **argv)
exitval = mount(argv[1], argv[2], argv[3], flags, data);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_mq_open.c b/audit-test/utils/bin/do_mq_open.c
index 85bdf5e..84f9af5 100644
--- a/audit-test/utils/bin/do_mq_open.c
+++ b/audit-test/utils/bin/do_mq_open.c
@@ -60,6 +60,6 @@ int main(int argc, char **argv)
exitval = mq_open(argv[1], flags, mode, NULL);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_mq_unlink.c b/audit-test/utils/bin/do_mq_unlink.c
index b58356f..3f3d4b0 100644
--- a/audit-test/utils/bin/do_mq_unlink.c
+++ b/audit-test/utils/bin/do_mq_unlink.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = mq_unlink(argv[1]);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_msgctl.c b/audit-test/utils/bin/do_msgctl.c
index cc91fd1..3571645 100644
--- a/audit-test/utils/bin/do_msgctl.c
+++ b/audit-test/utils/bin/do_msgctl.c
@@ -28,6 +28,6 @@ int main(int argc, char **argv)
exitval = do_msgctl(atoi(argv[1]), atoi(argv[2]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_msgget.c b/audit-test/utils/bin/do_msgget.c
index 8590e2b..af22246 100644
--- a/audit-test/utils/bin/do_msgget.c
+++ b/audit-test/utils/bin/do_msgget.c
@@ -32,6 +32,6 @@ int main(int argc, char **argv)
exitval = do_msgget(atoi(argv[1]), flags);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_msgrcv.c b/audit-test/utils/bin/do_msgrcv.c
index 28c721e..fea8212 100644
--- a/audit-test/utils/bin/do_msgrcv.c
+++ b/audit-test/utils/bin/do_msgrcv.c
@@ -28,6 +28,6 @@ int main(int argc, char **argv)
exitval = do_msgrcv(atoi(argv[1]), atoi(argv[2]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_msgsnd.c b/audit-test/utils/bin/do_msgsnd.c
index a00531d..6b1e408 100644
--- a/audit-test/utils/bin/do_msgsnd.c
+++ b/audit-test/utils/bin/do_msgsnd.c
@@ -28,6 +28,6 @@ int main(int argc, char **argv)
exitval = do_msgsnd(atoi(argv[1]), atoi(argv[2]), argv[3]);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_open.c b/audit-test/utils/bin/do_open.c
index 781f6f9..9aca94f 100644
--- a/audit-test/utils/bin/do_open.c
+++ b/audit-test/utils/bin/do_open.c
@@ -57,6 +57,6 @@ int main(int argc, char **argv)
exitval = open(argv[1], flags, S_IRWXU);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_openat.c b/audit-test/utils/bin/do_openat.c
index 9c30c5e..72c3965 100644
--- a/audit-test/utils/bin/do_openat.c
+++ b/audit-test/utils/bin/do_openat.c
@@ -69,6 +69,6 @@ int main(int argc, char **argv)
exitval = openat(dirfd, argv[2], flags);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_ptrace.c b/audit-test/utils/bin/do_ptrace.c
index 6c1959a..469cb9a 100644
--- a/audit-test/utils/bin/do_ptrace.c
+++ b/audit-test/utils/bin/do_ptrace.c
@@ -41,6 +41,6 @@ int main(int argc, char **argv)
exitval = ptrace(req, atoi(argv[1]), NULL, NULL);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_read.c b/audit-test/utils/bin/do_read.c
index 7d63b7d..dd7f477 100644
--- a/audit-test/utils/bin/do_read.c
+++ b/audit-test/utils/bin/do_read.c
@@ -68,6 +68,6 @@ int main(int argc, char **argv)
read_len = read(sock, buf, buf_len);
result = (read_len <= 0 ? TEST_FAIL : TEST_SUCCESS);
- printf("%d %zd %d\n", result, result ? errno : read_len, getpid());
+ fprintf(stderr, "%d %zd %d\n", result, result ? errno : read_len, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_readlink.c b/audit-test/utils/bin/do_readlink.c
index 094b850..a2e6801 100644
--- a/audit-test/utils/bin/do_readlink.c
+++ b/audit-test/utils/bin/do_readlink.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = readlink(argv[1], buf, PATH_MAX);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_readlinkat.c b/audit-test/utils/bin/do_readlinkat.c
index bb4fa7d..ca2cc28 100644
--- a/audit-test/utils/bin/do_readlinkat.c
+++ b/audit-test/utils/bin/do_readlinkat.c
@@ -40,6 +40,6 @@ int main(int argc, char **argv)
exitval = readlinkat(dir_fd, argv[2], buf, PATH_MAX);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_recvfrom.c b/audit-test/utils/bin/do_recvfrom.c
index 1e006b9..373b0dd 100644
--- a/audit-test/utils/bin/do_recvfrom.c
+++ b/audit-test/utils/bin/do_recvfrom.c
@@ -67,6 +67,6 @@ int main(int argc, char **argv)
rc = recvfrom(sock, buf, buf_len, 0, NULL, NULL);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
- printf("%d %d %d\n", result, result ? errno : rc, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : rc, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_recvmmsg.c b/audit-test/utils/bin/do_recvmmsg.c
index c125a4c..9189700 100644
--- a/audit-test/utils/bin/do_recvmmsg.c
+++ b/audit-test/utils/bin/do_recvmmsg.c
@@ -76,6 +76,6 @@ int main(int argc, char **argv)
rc = recvmmsg(sock, &mmsg, 1, 0, &ts);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
- printf("%d %d %d\n", result, result ? errno : rc, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : rc, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_recvmsg.c b/audit-test/utils/bin/do_recvmsg.c
index 303f14a..64bb11f 100644
--- a/audit-test/utils/bin/do_recvmsg.c
+++ b/audit-test/utils/bin/do_recvmsg.c
@@ -75,6 +75,6 @@ int main(int argc, char **argv)
rc = recvmsg(sock, &msg, 0);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
- printf("%d %d %d\n", result, result ? errno : rc, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : rc, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_removexattr.c b/audit-test/utils/bin/do_removexattr.c
index 3ff77e7..7d8e2ee 100644
--- a/audit-test/utils/bin/do_removexattr.c
+++ b/audit-test/utils/bin/do_removexattr.c
@@ -30,6 +30,6 @@ int main(int argc, char **argv)
exitval = removexattr(argv[1], argv[2]);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_rename.c b/audit-test/utils/bin/do_rename.c
index 1c069e6..09ec57f 100644
--- a/audit-test/utils/bin/do_rename.c
+++ b/audit-test/utils/bin/do_rename.c
@@ -28,6 +28,6 @@ int main(int argc, char **argv)
exitval = rename(argv[1], argv[2]);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_renameat.c b/audit-test/utils/bin/do_renameat.c
index 96f0545..5889a2d 100644
--- a/audit-test/utils/bin/do_renameat.c
+++ b/audit-test/utils/bin/do_renameat.c
@@ -40,6 +40,6 @@ int main(int argc, char **argv)
exitval = renameat(dir_fd, argv[2], dir_fd, argv[3]);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_rmdir.c b/audit-test/utils/bin/do_rmdir.c
index 2d36964..1af8126 100644
--- a/audit-test/utils/bin/do_rmdir.c
+++ b/audit-test/utils/bin/do_rmdir.c
@@ -28,6 +28,6 @@ int main(int argc, char **argv)
exitval = rmdir(argv[1]);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_semctl.c b/audit-test/utils/bin/do_semctl.c
index de5100b..3e9b56f 100644
--- a/audit-test/utils/bin/do_semctl.c
+++ b/audit-test/utils/bin/do_semctl.c
@@ -28,6 +28,6 @@ int main(int argc, char **argv)
exitval = do_semctl(atoi(argv[1]), atoi(argv[2]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_semget.c b/audit-test/utils/bin/do_semget.c
index e8cfcda..141ae33 100644
--- a/audit-test/utils/bin/do_semget.c
+++ b/audit-test/utils/bin/do_semget.c
@@ -32,6 +32,6 @@ int main(int argc, char **argv)
exitval = do_semget(atoi(argv[1]), flags);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_semop.c b/audit-test/utils/bin/do_semop.c
index 46d06ff..4287ce4 100644
--- a/audit-test/utils/bin/do_semop.c
+++ b/audit-test/utils/bin/do_semop.c
@@ -32,6 +32,6 @@ int main(int argc, char **argv)
exitval = do_semop(atoi(argv[1]), flags);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_semtimedop.c b/audit-test/utils/bin/do_semtimedop.c
index a7b2454..d588c2e 100644
--- a/audit-test/utils/bin/do_semtimedop.c
+++ b/audit-test/utils/bin/do_semtimedop.c
@@ -32,6 +32,6 @@ int main(int argc, char **argv)
exitval = do_semtimedop(atoi(argv[1]), flags);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_send.c b/audit-test/utils/bin/do_send.c
index 8a25675..80f62e8 100644
--- a/audit-test/utils/bin/do_send.c
+++ b/audit-test/utils/bin/do_send.c
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
rc = send(sock, MSG_STRING, MSG_LEN, sflgs);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
- printf("%d %d %d\n", result, result ? errno : rc, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : rc, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_sendmsg.c b/audit-test/utils/bin/do_sendmsg.c
index 31cab17..358ad15 100644
--- a/audit-test/utils/bin/do_sendmsg.c
+++ b/audit-test/utils/bin/do_sendmsg.c
@@ -51,6 +51,6 @@ int main(int argc, char **argv)
rc = sendmsg(sock, &msg, 0);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
- printf("%d %d %d\n", result, result ? errno : rc, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : rc, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_sendto.c b/audit-test/utils/bin/do_sendto.c
index fbd0ec8..8108eed 100644
--- a/audit-test/utils/bin/do_sendto.c
+++ b/audit-test/utils/bin/do_sendto.c
@@ -44,6 +44,6 @@ int main(int argc, char **argv)
rc = sendto(sock, MSG_STRING, MSG_LEN, 0, host->ai_addr, host->ai_addrlen);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
- printf("%d %d %d\n", result, result ? errno : rc, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : rc, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setfsgid.c b/audit-test/utils/bin/do_setfsgid.c
index 5677f84..1bf5261 100644
--- a/audit-test/utils/bin/do_setfsgid.c
+++ b/audit-test/utils/bin/do_setfsgid.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setfsgid, atoi(argv[1]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setfsgid32.c b/audit-test/utils/bin/do_setfsgid32.c
index 4d5e6ec..479714d 100644
--- a/audit-test/utils/bin/do_setfsgid32.c
+++ b/audit-test/utils/bin/do_setfsgid32.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setfsgid32, atoi(argv[1]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setfsuid.c b/audit-test/utils/bin/do_setfsuid.c
index 6ac6cbb..f7dbe22 100644
--- a/audit-test/utils/bin/do_setfsuid.c
+++ b/audit-test/utils/bin/do_setfsuid.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setfsuid, atoi(argv[1]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setfsuid32.c b/audit-test/utils/bin/do_setfsuid32.c
index 6e44cfc..377c577 100644
--- a/audit-test/utils/bin/do_setfsuid32.c
+++ b/audit-test/utils/bin/do_setfsuid32.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setfsuid32, atoi(argv[1]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setgid.c b/audit-test/utils/bin/do_setgid.c
index 4299c06..bc7aba0 100644
--- a/audit-test/utils/bin/do_setgid.c
+++ b/audit-test/utils/bin/do_setgid.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setgid, atoi(argv[1]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setgid32.c b/audit-test/utils/bin/do_setgid32.c
index 452bc56..a80d38d 100644
--- a/audit-test/utils/bin/do_setgid32.c
+++ b/audit-test/utils/bin/do_setgid32.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setgid32, atoi(argv[1]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setgroups.c b/audit-test/utils/bin/do_setgroups.c
index 1013bc6..47c5d82 100644
--- a/audit-test/utils/bin/do_setgroups.c
+++ b/audit-test/utils/bin/do_setgroups.c
@@ -51,6 +51,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setgroups, nr_groups, &grouplist);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setgroups32.c b/audit-test/utils/bin/do_setgroups32.c
index a06959b..abaab82 100644
--- a/audit-test/utils/bin/do_setgroups32.c
+++ b/audit-test/utils/bin/do_setgroups32.c
@@ -51,6 +51,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setgroups32, nr_groups, &grouplist);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setregid.c b/audit-test/utils/bin/do_setregid.c
index b067ae2..d3220ad 100644
--- a/audit-test/utils/bin/do_setregid.c
+++ b/audit-test/utils/bin/do_setregid.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setregid, gid, gid);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setregid32.c b/audit-test/utils/bin/do_setregid32.c
index 4280e8e..efb12e9 100644
--- a/audit-test/utils/bin/do_setregid32.c
+++ b/audit-test/utils/bin/do_setregid32.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setregid32, gid, gid);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setresgid.c b/audit-test/utils/bin/do_setresgid.c
index 8e2bcc7..be14ddb 100644
--- a/audit-test/utils/bin/do_setresgid.c
+++ b/audit-test/utils/bin/do_setresgid.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setresgid, gid, gid, gid);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setresgid32.c b/audit-test/utils/bin/do_setresgid32.c
index b5c3e26..84340e5 100644
--- a/audit-test/utils/bin/do_setresgid32.c
+++ b/audit-test/utils/bin/do_setresgid32.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setresgid32, gid, gid, gid);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setresuid.c b/audit-test/utils/bin/do_setresuid.c
index 5e03ac8..ec3b8ad 100644
--- a/audit-test/utils/bin/do_setresuid.c
+++ b/audit-test/utils/bin/do_setresuid.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setresuid, uid, uid, uid);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setresuid32.c b/audit-test/utils/bin/do_setresuid32.c
index e4a6de2..46a1f3b 100644
--- a/audit-test/utils/bin/do_setresuid32.c
+++ b/audit-test/utils/bin/do_setresuid32.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setresuid32, uid, uid, uid);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setreuid.c b/audit-test/utils/bin/do_setreuid.c
index 2d06a06..872e974 100644
--- a/audit-test/utils/bin/do_setreuid.c
+++ b/audit-test/utils/bin/do_setreuid.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setreuid, uid, uid);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setreuid32.c b/audit-test/utils/bin/do_setreuid32.c
index e33ea5c..3ba7fa6 100644
--- a/audit-test/utils/bin/do_setreuid32.c
+++ b/audit-test/utils/bin/do_setreuid32.c
@@ -31,6 +31,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setreuid32, uid, uid);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_settimeofday.c b/audit-test/utils/bin/do_settimeofday.c
index e45ce50..921d6f6 100644
--- a/audit-test/utils/bin/do_settimeofday.c
+++ b/audit-test/utils/bin/do_settimeofday.c
@@ -44,6 +44,6 @@ int main(int argc, char **argv)
exitval = settimeofday(&tv, tz);
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setuid.c b/audit-test/utils/bin/do_setuid.c
index 2ad35f0..581b8b8 100644
--- a/audit-test/utils/bin/do_setuid.c
+++ b/audit-test/utils/bin/do_setuid.c
@@ -29,6 +29,6 @@ int main(int argc, char **argv)
exitval = syscall(__NR_setuid, atoi(argv[1]));
result = exitval < 0;
- printf("%d %d %d\n", result, result ? errno : exitval, getpid());
+ fprintf(stderr, "%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
}
diff --git a/audit-test/utils/bin/do_setuid32.c b/audit-test/utils/bin/do_setuid32.c
index 3d6906b..68d...
[truncated message content] |
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:56
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/Makefile | 14 +-------------
audit-test/utils/bin/ipc_common.c | 17 ++++++++++++++++-
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/audit-test/utils/bin/Makefile b/audit-test/utils/bin/Makefile
index bbead88..aeaa493 100644
--- a/audit-test/utils/bin/Makefile
+++ b/audit-test/utils/bin/Makefile
@@ -207,19 +207,7 @@ $(MQ_EXE): LDLIBS += -lrt
endif
$(RT_EXE): LDLIBS += -lrt
-headerhack:
- @echo -en "/* Do NOT edit this file directly," \
- "it is generated from /usr/include/linux/ipc.h\n" \
- " which cannot be included due to an obsolete definition of" \
- "struct ipc_perm */\n\n" > ipc_hack.h && \
- gcc -E -dM /usr/include/linux/ipc.h | egrep "SEM|MSG|SHM" >> ipc_hack.h;
-
-clean: headerhack_clean
-headerhack_clean:
- $(RM) ipc_hack.h
-
-
-all: headerhack $(ALL_EXE)
+all: $(ALL_EXE)
clobber:
$(RM) $(ALL_EXE)
diff --git a/audit-test/utils/bin/ipc_common.c b/audit-test/utils/bin/ipc_common.c
index 2c93e4d..724b130 100644
--- a/audit-test/utils/bin/ipc_common.c
+++ b/audit-test/utils/bin/ipc_common.c
@@ -14,11 +14,26 @@
*/
#include "includes.h"
-#include "ipc_hack.h"
#include <sys/msg.h>
#include <sys/sem.h>
#include <sys/shm.h>
+/* from <linux/ipc.h> which has conflicting definition of ipc_perm */
+/* NOTE that these defines are (at this time) used only internally
+ * for one specific switch{} in do_ipc.c */
+#define SEMOP 1
+#define SEMGET 2
+#define SEMCTL 3
+#define SEMTIMEDOP 4
+#define MSGSND 11
+#define MSGRCV 12
+#define MSGGET 13
+#define MSGCTL 14
+#define SHMAT 21
+#define SHMDT 22
+#define SHMGET 23
+#define SHMCTL 24
+
int check_ipc_usage(char *call, int nargs)
{
if (!strcmp(call, "msgctl") || !strcmp(call, "msgget") ||
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:49
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_fchmodat.c | 12 ++++++++----
audit-test/utils/bin/do_fchownat.c | 12 ++++++++----
audit-test/utils/bin/do_linkat.c | 24 ++++++++++++++++++------
audit-test/utils/bin/do_mkdirat.c | 12 +++++++++---
audit-test/utils/bin/do_mknodat.c | 13 ++++++++++---
audit-test/utils/bin/do_openat.c | 13 +++++++++----
audit-test/utils/bin/do_readlinkat.c | 12 +++++++++---
audit-test/utils/bin/do_renameat.c | 12 +++++++++---
audit-test/utils/bin/do_symlinkat.c | 13 ++++++++++---
audit-test/utils/bin/do_unlinkat.c | 12 +++++++++---
audit-test/utils/bin/do_utimensat.c | 12 ++++++++----
11 files changed, 107 insertions(+), 40 deletions(-)
diff --git a/audit-test/utils/bin/do_fchmodat.c b/audit-test/utils/bin/do_fchmodat.c
index ce49746..006cf50 100644
--- a/audit-test/utils/bin/do_fchmodat.c
+++ b/audit-test/utils/bin/do_fchmodat.c
@@ -26,10 +26,14 @@ int main(int argc, char **argv)
return TEST_ERROR;
}
- dir_fd = open(argv[1], O_DIRECTORY);
- if (dir_fd == -1) {
- perror("do_fchmodat: open dir fd");
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dir_fd = AT_FDCWD;
+ } else {
+ dir_fd = open(argv[1], O_DIRECTORY);
+ if (dir_fd == -1) {
+ perror("do_fchmodat: open dir_fd");
+ return TEST_ERROR;
+ }
}
errno = 0;
diff --git a/audit-test/utils/bin/do_fchownat.c b/audit-test/utils/bin/do_fchownat.c
index 2d2baf5..5eb16ae 100644
--- a/audit-test/utils/bin/do_fchownat.c
+++ b/audit-test/utils/bin/do_fchownat.c
@@ -28,10 +28,14 @@ int main(int argc, char **argv)
return TEST_ERROR;
}
- dir_fd = open(argv[1], O_DIRECTORY);
- if (dir_fd == -1) {
- perror("do_fchownat: open dir fd");
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dir_fd = AT_FDCWD;
+ } else {
+ dir_fd = open(argv[1], O_DIRECTORY);
+ if (dir_fd == -1) {
+ perror("do_fchownat: open dir_fd");
+ return TEST_ERROR;
+ }
}
pw = getpwnam(argv[3]);
diff --git a/audit-test/utils/bin/do_linkat.c b/audit-test/utils/bin/do_linkat.c
index 0f528f4..41535b8 100644
--- a/audit-test/utils/bin/do_linkat.c
+++ b/audit-test/utils/bin/do_linkat.c
@@ -26,15 +26,27 @@ int main(int argc, char **argv)
}
/* directory */
- dir_fd = open(argv[1], O_DIRECTORY);
- if (dir_fd < 0)
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dir_fd = AT_FDCWD;
+ } else {
+ dir_fd = open(argv[1], O_DIRECTORY);
+ if (dir_fd == -1) {
+ perror("do_linkat: open dir_fd");
+ return TEST_ERROR;
+ }
+ }
/* new_directory */
if (argc > 4) {
- newdir_fd = open(argv[4], O_DIRECTORY);
- if (newdir_fd < 0)
- return TEST_ERROR;
+ if (!strcmp(argv[4], "AT_FDCWD")) {
+ newdir_fd = AT_FDCWD;
+ } else {
+ newdir_fd = open(argv[4], O_DIRECTORY);
+ if (newdir_fd == -1) {
+ perror("do_linkat: open newdir_fd");
+ return TEST_ERROR;
+ }
+ }
} else {
newdir_fd = dir_fd;
}
diff --git a/audit-test/utils/bin/do_mkdirat.c b/audit-test/utils/bin/do_mkdirat.c
index 5a6e54f..a3fe48f 100644
--- a/audit-test/utils/bin/do_mkdirat.c
+++ b/audit-test/utils/bin/do_mkdirat.c
@@ -35,9 +35,15 @@ int main(int argc, char **argv)
}
#endif
- dir_fd = open(argv[1], O_DIRECTORY);
- if (dir_fd < 0)
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dir_fd = AT_FDCWD;
+ } else {
+ dir_fd = open(argv[1], O_DIRECTORY);
+ if (dir_fd == -1) {
+ perror("do_mkdirat: open dir_fd");
+ return TEST_ERROR;
+ }
+ }
errno = 0;
exitval = mkdirat(dir_fd, argv[2], S_IRWXU);
diff --git a/audit-test/utils/bin/do_mknodat.c b/audit-test/utils/bin/do_mknodat.c
index 7e9ea2c..d6f5f47 100644
--- a/audit-test/utils/bin/do_mknodat.c
+++ b/audit-test/utils/bin/do_mknodat.c
@@ -28,9 +28,16 @@ int main(int argc, char **argv)
return TEST_ERROR;
}
- dir_fd = open(argv[1], O_DIRECTORY);
- if (dir_fd < 0)
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dir_fd = AT_FDCWD;
+ } else {
+ dir_fd = open(argv[1], O_DIRECTORY);
+ if (dir_fd == -1) {
+ perror("do_mknodat: open dir_fd");
+ return TEST_ERROR;
+ }
+ }
+
#ifdef LSM_SELINUX
if (argc == 4 && setfscreatecon(argv[3]) < 0) {
perror("do_mknodat: setfscreatecon");
diff --git a/audit-test/utils/bin/do_openat.c b/audit-test/utils/bin/do_openat.c
index 6205406..9c30c5e 100644
--- a/audit-test/utils/bin/do_openat.c
+++ b/audit-test/utils/bin/do_openat.c
@@ -48,11 +48,16 @@ int main(int argc, char **argv)
return TEST_ERROR;
}
- dirfd = open(argv[1], O_DIRECTORY);
- if (dirfd == -1) {
- perror("do_openat: open dirfd");
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dirfd = AT_FDCWD;
+ } else {
+ dirfd = open(argv[1], O_DIRECTORY);
+ if (dirfd == -1) {
+ perror("do_openat: open dirfd");
+ return TEST_ERROR;
+ }
}
+
#ifdef LSM_SELINUX
if (argc == 5 && setfscreatecon(argv[4]) < 0) {
perror("do_openat: setfscreatecon");
diff --git a/audit-test/utils/bin/do_readlinkat.c b/audit-test/utils/bin/do_readlinkat.c
index 121e651..bb4fa7d 100644
--- a/audit-test/utils/bin/do_readlinkat.c
+++ b/audit-test/utils/bin/do_readlinkat.c
@@ -26,9 +26,15 @@ int main(int argc, char **argv)
return TEST_ERROR;
}
- dir_fd = open(argv[1], O_DIRECTORY);
- if (dir_fd < 0)
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dir_fd = AT_FDCWD;
+ } else {
+ dir_fd = open(argv[1], O_DIRECTORY);
+ if (dir_fd == -1) {
+ perror("do_readlinkat: open dir_fd");
+ return TEST_ERROR;
+ }
+ }
errno = 0;
exitval = readlinkat(dir_fd, argv[2], buf, PATH_MAX);
diff --git a/audit-test/utils/bin/do_renameat.c b/audit-test/utils/bin/do_renameat.c
index cbdec09..96f0545 100644
--- a/audit-test/utils/bin/do_renameat.c
+++ b/audit-test/utils/bin/do_renameat.c
@@ -26,9 +26,15 @@ int main(int argc, char **argv)
return TEST_ERROR;
}
- dir_fd = open(argv[1], O_DIRECTORY);
- if (dir_fd < 0)
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dir_fd = AT_FDCWD;
+ } else {
+ dir_fd = open(argv[1], O_DIRECTORY);
+ if (dir_fd == -1) {
+ perror("do_renameat: open dir_fd");
+ return TEST_ERROR;
+ }
+ }
errno = 0;
exitval = renameat(dir_fd, argv[2], dir_fd, argv[3]);
diff --git a/audit-test/utils/bin/do_symlinkat.c b/audit-test/utils/bin/do_symlinkat.c
index 1829dcf..3edcb39 100644
--- a/audit-test/utils/bin/do_symlinkat.c
+++ b/audit-test/utils/bin/do_symlinkat.c
@@ -29,9 +29,16 @@ int main(int argc, char **argv)
return TEST_ERROR;
}
- dir_fd = open(argv[1], O_DIRECTORY);
- if (dir_fd < 0)
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dir_fd = AT_FDCWD;
+ } else {
+ dir_fd = open(argv[1], O_DIRECTORY);
+ if (dir_fd == -1) {
+ perror("do_symlinkat: open dir_fd");
+ return TEST_ERROR;
+ }
+ }
+
#ifdef LSM_SELINUX
if (argc == 5 && setfscreatecon(argv[4]) < 0) {
perror("do_symlinkat: setfscreatecon");
diff --git a/audit-test/utils/bin/do_unlinkat.c b/audit-test/utils/bin/do_unlinkat.c
index 8694bd8..f72f4e0 100644
--- a/audit-test/utils/bin/do_unlinkat.c
+++ b/audit-test/utils/bin/do_unlinkat.c
@@ -25,9 +25,15 @@ int main(int argc, char **argv)
return TEST_ERROR;
}
- dir_fd = open(argv[1], O_DIRECTORY);
- if (dir_fd < 0)
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dir_fd = AT_FDCWD;
+ } else {
+ dir_fd = open(argv[1], O_DIRECTORY);
+ if (dir_fd == -1) {
+ perror("do_unlinkat: open dir_fd");
+ return TEST_ERROR;
+ }
+ }
errno = 0;
exitval = unlinkat(dir_fd, argv[2], 0);
diff --git a/audit-test/utils/bin/do_utimensat.c b/audit-test/utils/bin/do_utimensat.c
index bf1fe0b..46f3adb 100644
--- a/audit-test/utils/bin/do_utimensat.c
+++ b/audit-test/utils/bin/do_utimensat.c
@@ -28,10 +28,14 @@ int main(int argc, char **argv)
return TEST_ERROR;
}
- dirfd = open(argv[1], O_DIRECTORY);
- if (dirfd == -1) {
- perror("do_utimensat: open dirfd");
- return TEST_ERROR;
+ if (!strcmp(argv[1], "AT_FDCWD")) {
+ dirfd = AT_FDCWD;
+ } else {
+ dirfd = open(argv[1], O_DIRECTORY);
+ if (dirfd == -1) {
+ perror("do_utimensat: open dirfd");
+ return TEST_ERROR;
+ }
}
times[0].tv_sec = 0;
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:44
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_linkat.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/audit-test/utils/bin/do_linkat.c b/audit-test/utils/bin/do_linkat.c
index d73bf20..0f528f4 100644
--- a/audit-test/utils/bin/do_linkat.c
+++ b/audit-test/utils/bin/do_linkat.c
@@ -17,20 +17,30 @@
int main(int argc, char **argv)
{
- int dir_fd;
+ int dir_fd, newdir_fd;
int exitval, result;
- if (argc != 4) {
- fprintf(stderr, "Usage:\n%s <directory> <oldpath> <newpath>\n", argv[0]);
+ if (argc < 4) {
+ fprintf(stderr, "Usage:\n%s <directory> <oldpath> <newpath> [<new_directory>]\n", argv[0]);
return TEST_ERROR;
}
+ /* directory */
dir_fd = open(argv[1], O_DIRECTORY);
if (dir_fd < 0)
- return TEST_ERROR;
+ return TEST_ERROR;
+
+ /* new_directory */
+ if (argc > 4) {
+ newdir_fd = open(argv[4], O_DIRECTORY);
+ if (newdir_fd < 0)
+ return TEST_ERROR;
+ } else {
+ newdir_fd = dir_fd;
+ }
errno = 0;
- exitval = linkat(dir_fd, argv[2], dir_fd, argv[3], 0);
+ exitval = linkat(dir_fd, argv[2], newdir_fd, argv[3], 0);
result = exitval < 0;
printf("%d %d %d\n", result, result ? errno : exitval, getpid());
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:41
|
From: Ondrej Moris <om...@re...>
Signed-off-by: Ondrej Moris <om...@re...>
---
audit-test/utils/bin/do_utimensat.c | 30 +++++++++++++++++++++++++++---
audit-test/utils/bin/do_utimes.c | 19 +++++++++++++++----
2 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/audit-test/utils/bin/do_utimensat.c b/audit-test/utils/bin/do_utimensat.c
index 660b926..bf1fe0b 100644
--- a/audit-test/utils/bin/do_utimensat.c
+++ b/audit-test/utils/bin/do_utimensat.c
@@ -15,6 +15,7 @@
#include "includes.h"
#include <sys/time.h>
+#include <ctype.h>
int main(int argc, char **argv)
{
@@ -22,9 +23,9 @@ int main(int argc, char **argv)
int exitval, result = 0;
int dirfd;
- if (argc != 3) {
- fprintf(stderr, "Usage:\n%s <dir> <path>\n", argv[0]);
- return TEST_ERROR;
+ if (argc != 3 && argc != 5) {
+ fprintf(stderr, "Usage:\n%s <dir> <path> [atime] [mtime]\n", argv[0]);
+ return TEST_ERROR;
}
dirfd = open(argv[1], O_DIRECTORY);
@@ -38,6 +39,29 @@ int main(int argc, char **argv)
times[1].tv_sec = 0;
times[1].tv_nsec = UTIME_NOW;
+ if (argc == 5) {
+ if (!strcmp(argv[3], "UTIME_NOW")) {
+ times[0].tv_sec = 0;
+ times[0].tv_nsec = UTIME_NOW;
+ } else if (!strcmp(argv[3], "UTIME_OMIT")) {
+ times[0].tv_sec = 0;
+ times[0].tv_nsec = UTIME_OMIT;
+ } else if (isdigit(argv[3][0])) {
+ times[0].tv_sec = atol(argv[3]);
+ times[0].tv_nsec = 0;
+ }
+ if (!strcmp(argv[4], "UTIME_NOW")) {
+ times[1].tv_sec = 0;
+ times[1].tv_nsec = UTIME_NOW;
+ } else if (!strcmp(argv[4], "UTIME_OMIT")) {
+ times[1].tv_sec = 0;
+ times[1].tv_nsec = UTIME_OMIT;
+ } else if (isdigit(argv[4][0])) {
+ times[1].tv_sec = atol(argv[4]);
+ times[1].tv_nsec = 0;
+ }
+ }
+
errno = 0;
exitval = utimensat(dirfd, argv[2], times, 0);
result = exitval < 0;
diff --git a/audit-test/utils/bin/do_utimes.c b/audit-test/utils/bin/do_utimes.c
index 9f12d68..6ca2062 100644
--- a/audit-test/utils/bin/do_utimes.c
+++ b/audit-test/utils/bin/do_utimes.c
@@ -15,18 +15,29 @@
#include "includes.h"
#include <sys/time.h>
+#include <ctype.h>
int main(int argc, char **argv)
{
int exitval, result;
+ struct timeval times[2];
- if (argc != 2) {
- fprintf(stderr, "Usage:\n%s <path>\n", argv[0]);
- return TEST_ERROR;
+ if (argc != 2 && argc != 4) {
+ fprintf(stderr, "Usage:\n%s <path> [actime_sec] [modtime_sec]\n", argv[0]);
+ return TEST_ERROR;
}
errno = 0;
- exitval = utimes(argv[1], NULL);
+ if (argc == 4 && isdigit(argv[2][0]) && isdigit(argv[3][0])) {
+ times[0].tv_sec = atol(argv[3]);
+ times[0].tv_usec = 0;
+ times[1].tv_sec = atol(argv[3]);
+ times[1].tv_usec = 0;
+ exitval = utimes(argv[1], times);
+ } else {
+ exitval = utimes(argv[1], NULL);
+ }
+
result = exitval < 0;
printf("%d %d %d\n", result, result ? errno : exitval, getpid());
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:37
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_settimeofday.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/audit-test/utils/bin/do_settimeofday.c b/audit-test/utils/bin/do_settimeofday.c
index 7dba2d0..e45ce50 100644
--- a/audit-test/utils/bin/do_settimeofday.c
+++ b/audit-test/utils/bin/do_settimeofday.c
@@ -20,24 +20,28 @@ int main(int argc, char **argv)
{
int exitval, result;
struct timeval tv;
- struct timezone tz;
+ struct timezone tz_data, *tz = NULL;
- if (argc < 3) {
- fprintf(stderr, "Usage:\n%s <seconds> <timezone> [DST correction]\n",
+ if (argc < 2) {
+ fprintf(stderr, "Usage:\n%s <seconds> [timezone] [DST correction]\n",
argv[0]);
return TEST_ERROR;
}
- memset(&tv, 0, sizeof(tv));
- memset(&tz, 0, sizeof(tz));
-
+ memset(&tv, 0, sizeof(struct timeval));
tv.tv_sec = atol(argv[1]);
- tz.tz_minuteswest = atoi(argv[2]);
+
+ if (argc >= 3) {
+ tz = &tz_data;
+ memset(tz, 0, sizeof(struct timezone));
+ tz->tz_minuteswest = atoi(argv[2]);
+ }
+
if (argc >= 4)
- tz.tz_dsttime = atoi(argv[3]);
+ tz->tz_dsttime = atoi(argv[3]);
errno = 0;
- exitval = settimeofday(&tv, &tz);
+ exitval = settimeofday(&tv, tz);
result = exitval < 0;
printf("%d %d %d\n", result, result ? errno : exitval, getpid());
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:31
|
The output was conflicting with "testres exitval pid" fprintf
and doesn't seem to be used anywhere in the suite.
Furthermore, it doesn't alter the behavior of the fork syscall,
since it's getrlimit, not setrlimit.
Whitespace separation from the rest of the code suggests that this
was perhaps a debugging (temporary) code.
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_fork.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/audit-test/utils/bin/do_fork.c b/audit-test/utils/bin/do_fork.c
index f77ceea..991fded 100644
--- a/audit-test/utils/bin/do_fork.c
+++ b/audit-test/utils/bin/do_fork.c
@@ -23,13 +23,6 @@ int main(int argc, char **argv)
int exitval, result;
pid_t pid;
-
- struct rlimit slimit;
-
- getrlimit(RLIMIT_NPROC, &slimit);
- fprintf(stderr, "rlim_cur = %d rlim_max = %d\n",
- (int)slimit.rlim_cur, (int)slimit.rlim_max);
-
/* use syscall() to force fork, as the fork() library routine
* doesn't call sys_fork on x86_64. */
errno = 0;
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:28
|
- numeric uid/gid now supported
- special value -1 means "don't change" (see man 2 chown)
- better error reporting from get*nam()
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_chown.c | 45 ++++++++++++++++++++++++++++-----------
audit-test/utils/bin/do_lchown.c | 46 ++++++++++++++++++++++++++++------------
2 files changed, 66 insertions(+), 25 deletions(-)
diff --git a/audit-test/utils/bin/do_chown.c b/audit-test/utils/bin/do_chown.c
index 54ff5b6..0bb1b91 100644
--- a/audit-test/utils/bin/do_chown.c
+++ b/audit-test/utils/bin/do_chown.c
@@ -20,32 +20,53 @@
int main(int argc, char **argv)
{
int exitval, result;
- gid_t gid = -1;
+ long id_read;
+ char *endptr;
uid_t uid = -1;
+ gid_t gid = -1;
struct passwd *pw;
- struct group *grp;
+ struct group *gr;
- if (argc != 3 && argc != 4) {
- fprintf(stderr, "Usage:\n%s <path> <owner> [<group>]\n", argv[0]);
+ if (argc < 3) {
+ fprintf(stderr, "Usage:\n%s <path> <owner> [group]\n", argv[0]);
return TEST_ERROR;
}
- if(strcmp(argv[2],"")) {
+ /* try to convert owner/group into numeric values,
+ * if it fails with EINVAL, the owner/group is probably given
+ * as name (and to be resolved via get*nam) */
+
+ /* uid */
+ errno = 0;
+ id_read = strtol(argv[2], &endptr, 10);
+ if (errno || endptr == argv[2] || id_read > USHRT_MAX) {
+ errno = 0;
pw = getpwnam(argv[2]);
if (!pw) {
- perror("do_chown: getpwnam");
+ fprintf(stderr, "do_chown: getpwnam: %s\n",
+ errno ? strerror(errno) : "no entry found");
return TEST_ERROR;
}
uid = pw->pw_uid;
+ } else {
+ uid = id_read;
}
- if(argc == 4 && strcmp(argv[3],"")) {
- grp = getgrnam(argv[3]);
- if(!grp) {
- perror("do_chown: getgrnam");
- return TEST_ERROR;
+ /* gid */
+ if (argc > 3) {
+ errno = 0;
+ id_read = strtol(argv[3], &endptr, 10);
+ if (errno || endptr == argv[3] || id_read > USHRT_MAX) {
+ gr = getgrnam(argv[3]);
+ if (!gr) {
+ fprintf(stderr, "do_chown: getgrnam: %s\n",
+ errno ? strerror(errno) : "no entry found");
+ return TEST_ERROR;
+ }
+ gid = gr->gr_gid;
+ } else {
+ gid = id_read;
}
- gid = grp->gr_gid;
}
/* use syscall() to force chown over chown32 */
diff --git a/audit-test/utils/bin/do_lchown.c b/audit-test/utils/bin/do_lchown.c
index ab19662..4585b42 100644
--- a/audit-test/utils/bin/do_lchown.c
+++ b/audit-test/utils/bin/do_lchown.c
@@ -20,32 +20,53 @@
int main(int argc, char **argv)
{
int exitval, result;
- gid_t gid = -1;
+ long id_read;
+ char *endptr;
uid_t uid = -1;
+ gid_t gid = -1;
struct passwd *pw;
- struct group *grp;
+ struct group *gr;
- if (argc != 3 && argc != 4) {
- fprintf(stderr, "Usage:\n%s <path> <owner> [<group>]\n", argv[0]);
+ if (argc < 3) {
+ fprintf(stderr, "Usage:\n%s <path> <owner> [group]\n", argv[0]);
return TEST_ERROR;
}
- if(strcmp(argv[2],"")) {
+ /* try to convert owner/group into numeric values,
+ * if it fails with EINVAL, the owner/group is probably given
+ * as name (and to be resolved via get*nam) */
+
+ /* uid */
+ errno = 0;
+ id_read = strtol(argv[2], &endptr, 10);
+ if (errno || endptr == argv[2] || id_read > USHRT_MAX) {
+ errno = 0;
pw = getpwnam(argv[2]);
if (!pw) {
- perror("do_lchown: getpwnam");
+ fprintf(stderr, "do_lchown: getpwnam: %s\n",
+ errno ? strerror(errno) : "no entry found");
return TEST_ERROR;
}
uid = pw->pw_uid;
+ } else {
+ uid = id_read;
}
- if(argc == 4 && strcmp(argv[3],"")) {
- grp = getgrnam(argv[3]);
- if(!grp) {
- perror("do_lchown: getgrnam");
- return TEST_ERROR;
+ /* gid */
+ if (argc > 3) {
+ errno = 0;
+ id_read = strtol(argv[3], &endptr, 10);
+ if (errno || endptr == argv[3] || id_read > USHRT_MAX) {
+ gr = getgrnam(argv[3]);
+ if (!gr) {
+ fprintf(stderr, "do_lchown: getgrnam: %s\n",
+ errno ? strerror(errno) : "no entry found");
+ return TEST_ERROR;
+ }
+ gid = gr->gr_gid;
+ } else {
+ gid = id_read;
}
- gid = grp->gr_gid;
}
errno = 0;
@@ -54,5 +75,4 @@ int main(int argc, char **argv)
printf("%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
-
}
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:24
|
From: Miroslav Vadkerti <mva...@re...>
This patch makes it possible to optionally set user
or group or both. To skip the setting pass empty string,
i.e. "".
This change is backward compatible with previous binary
usage in the syscall bucket.
Signed-off-by: Miroslav Vadkerti <mva...@re...>
---
audit-test/utils/bin/do_chown.c | 32 ++++++++++++++++++++++++--------
audit-test/utils/bin/do_lchown.c | 34 +++++++++++++++++++++++++---------
2 files changed, 49 insertions(+), 17 deletions(-)
diff --git a/audit-test/utils/bin/do_chown.c b/audit-test/utils/bin/do_chown.c
index 01b4b1e..54ff5b6 100644
--- a/audit-test/utils/bin/do_chown.c
+++ b/audit-test/utils/bin/do_chown.c
@@ -15,26 +15,42 @@
#include "includes.h"
#include <pwd.h>
+#include <grp.h>
int main(int argc, char **argv)
{
int exitval, result;
+ gid_t gid = -1;
+ uid_t uid = -1;
struct passwd *pw;
+ struct group *grp;
- if (argc != 3) {
- fprintf(stderr, "Usage:\n%s <path> <owner>\n", argv[0]);
- return TEST_ERROR;
+ if (argc != 3 && argc != 4) {
+ fprintf(stderr, "Usage:\n%s <path> <owner> [<group>]\n", argv[0]);
+ return TEST_ERROR;
}
- pw = getpwnam(argv[2]);
- if (!pw) {
- perror("do_chown: getpwnam");
- return TEST_ERROR;
+ if(strcmp(argv[2],"")) {
+ pw = getpwnam(argv[2]);
+ if (!pw) {
+ perror("do_chown: getpwnam");
+ return TEST_ERROR;
+ }
+ uid = pw->pw_uid;
+ }
+
+ if(argc == 4 && strcmp(argv[3],"")) {
+ grp = getgrnam(argv[3]);
+ if(!grp) {
+ perror("do_chown: getgrnam");
+ return TEST_ERROR;
+ }
+ gid = grp->gr_gid;
}
/* use syscall() to force chown over chown32 */
errno = 0;
- exitval = syscall(__NR_chown, argv[1], pw->pw_uid, -1);
+ exitval = syscall(__NR_chown, argv[1], uid, gid);
result = exitval < 0;
printf("%d %d %d\n", result, result ? errno : exitval, getpid());
diff --git a/audit-test/utils/bin/do_lchown.c b/audit-test/utils/bin/do_lchown.c
index da4be54..ab19662 100644
--- a/audit-test/utils/bin/do_lchown.c
+++ b/audit-test/utils/bin/do_lchown.c
@@ -15,28 +15,44 @@
#include "includes.h"
#include <pwd.h>
+#include <grp.h>
int main(int argc, char **argv)
{
int exitval, result;
+ gid_t gid = -1;
+ uid_t uid = -1;
struct passwd *pw;
+ struct group *grp;
- if (argc != 3) {
- fprintf(stderr, "Usage:\n%s <path> <owner>\n", argv[0]);
- return TEST_ERROR;
+ if (argc != 3 && argc != 4) {
+ fprintf(stderr, "Usage:\n%s <path> <owner> [<group>]\n", argv[0]);
+ return TEST_ERROR;
}
- pw = getpwnam(argv[2]);
- if (!pw) {
- perror("do_lchown: getpwnam");
- return TEST_ERROR;
+ if(strcmp(argv[2],"")) {
+ pw = getpwnam(argv[2]);
+ if (!pw) {
+ perror("do_lchown: getpwnam");
+ return TEST_ERROR;
+ }
+ uid = pw->pw_uid;
+ }
+
+ if(argc == 4 && strcmp(argv[3],"")) {
+ grp = getgrnam(argv[3]);
+ if(!grp) {
+ perror("do_lchown: getgrnam");
+ return TEST_ERROR;
+ }
+ gid = grp->gr_gid;
}
- /* use syscall() to force lchown over lchown32 */
errno = 0;
- exitval = syscall(__NR_lchown, argv[1], pw->pw_uid, -1);
+ exitval = syscall(__NR_lchown, argv[1], uid, gid);
result = exitval < 0;
printf("%d %d %d\n", result, result ? errno : exitval, getpid());
return result;
+
}
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:21
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_kill.c | 17 +++++++++++------
audit-test/utils/bin/do_tgkill.c | 13 +++++++++----
audit-test/utils/bin/do_tkill.c | 13 +++++++++----
3 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/audit-test/utils/bin/do_kill.c b/audit-test/utils/bin/do_kill.c
index b52a999..c811679 100644
--- a/audit-test/utils/bin/do_kill.c
+++ b/audit-test/utils/bin/do_kill.c
@@ -22,8 +22,8 @@ int main(int argc, char **argv)
int pid, signum;
if (argc < 3) {
- fprintf(stderr, "Usage:\n%s <pid> <sigkill|sigstop|sigusr1> [group]\n", argv[0]);
- return 1;
+ fprintf(stderr, "Usage:\n%s <pid> <sigkill|sigstop|sigusr1|pidcheck> [group]\n", argv[0]);
+ return 1;
}
pid = atoi(argv[1]);
@@ -33,17 +33,22 @@ int main(int argc, char **argv)
signum = SIGSTOP;
} else if (!strcmp(argv[2], "sigusr1")) {
signum = SIGUSR1;
+ } else if (!strcmp(argv[2], "pidcheck")) {
+ /* "If sig is 0, then no signal is sent, but error checking is still
+ * performed; this can be used to check for the existence of a process ID
+ * or process group ID." */
+ signum = 0;
} else {
- fprintf(stderr, "Usage:\n%s <pid> <sigkill|sigstop|sigusr1> [group]\n", argv[0]);
- return 1;
+ fprintf(stderr, "unsupported signal\n");
+ return 1;
}
if (argc > 3) {
if (!strcmp(argv[3], "group"))
pid = -pid;
else {
- fprintf(stderr, "Usage:\n%s <pid> <sigkill|sigstop|sigusr1> [group]\n", argv[0]);
- return 1;
+ fprintf(stderr, "invalid argument\n");
+ return 1;
}
}
diff --git a/audit-test/utils/bin/do_tgkill.c b/audit-test/utils/bin/do_tgkill.c
index b781a35..1d7db5c 100644
--- a/audit-test/utils/bin/do_tgkill.c
+++ b/audit-test/utils/bin/do_tgkill.c
@@ -22,8 +22,8 @@ int main(int argc, char **argv)
int pid, signum;
if (argc < 3) {
- fprintf(stderr, "Usage:\n%s <pid> <sigkill|sigstop|sigusr1>\n", argv[0]);
- return 1;
+ fprintf(stderr, "Usage:\n%s <pid> <sigkill|sigstop|sigusr1|pidcheck>\n", argv[0]);
+ return 1;
}
pid = atoi(argv[1]);
@@ -33,9 +33,14 @@ int main(int argc, char **argv)
signum = SIGSTOP;
} else if (!strcmp(argv[2], "sigusr1")) {
signum = SIGUSR1;
+ } else if (!strcmp(argv[2], "pidcheck")) {
+ /* "If sig is 0, then no signal is sent, but error checking is still
+ * performed; this can be used to check for the existence of a process ID
+ * or process group ID." */
+ signum = 0;
} else {
- fprintf(stderr, "Usage:\n%s <pid> <sigkill|sigstop|sigusr1>\n", argv[0]);
- return 1;
+ fprintf(stderr, "unsupported signal\n");
+ return 1;
}
errno = 0;
diff --git a/audit-test/utils/bin/do_tkill.c b/audit-test/utils/bin/do_tkill.c
index fd3ebd2..51b25be 100644
--- a/audit-test/utils/bin/do_tkill.c
+++ b/audit-test/utils/bin/do_tkill.c
@@ -22,8 +22,8 @@ int main(int argc, char **argv)
int pid, signum;
if (argc < 3) {
- fprintf(stderr, "Usage:\n%s <pid> <sigkill|sigstop|sigusr1>\n", argv[0]);
- return 1;
+ fprintf(stderr, "Usage:\n%s <pid> <sigkill|sigstop|sigusr1|pidcheck>\n", argv[0]);
+ return 1;
}
pid = atoi(argv[1]);
@@ -33,9 +33,14 @@ int main(int argc, char **argv)
signum = SIGSTOP;
} else if (!strcmp(argv[2], "sigusr1")) {
signum = SIGUSR1;
+ } else if (!strcmp(argv[2], "pidcheck")) {
+ /* "If sig is 0, then no signal is sent, but error checking is still
+ * performed; this can be used to check for the existence of a process ID
+ * or process group ID." */
+ signum = 0;
} else {
- fprintf(stderr, "Usage:\n%s <pid> <sigkill|sigstop|sigusr1>\n", argv[0]);
- return 1;
+ fprintf(stderr, "unsupported signal\n");
+ return 1;
}
/* use syscall() as no library routine for sys_tkill */
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:18
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_clone.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/audit-test/utils/bin/do_clone.c b/audit-test/utils/bin/do_clone.c
index 4988e3f..fa89ba8 100644
--- a/audit-test/utils/bin/do_clone.c
+++ b/audit-test/utils/bin/do_clone.c
@@ -22,16 +22,15 @@ int main(int argc, char **argv)
int flags = CLONE_VFORK;
pid_t pid;
- if (argc != 2) {
- fprintf(stderr, "Usage:\n%s <flag>\n", argv[0]);
- return TEST_ERROR;
- }
-
- if (!strcmp(argv[1], "newns")) {
- flags |= CLONE_NEWNS;
- } else {
- fprintf(stderr, "Usage:\n%s: unknown flag: %s\n", argv[0], argv[1]);
- return TEST_ERROR;
+ /* Usage: "%s [flag]\n", argv[0] */
+
+ if (argc >= 2) {
+ if (!strcmp(argv[1], "newns")) {
+ flags |= CLONE_NEWNS;
+ } else {
+ fprintf(stderr, "unknown flag: %s\n", argv[1]);
+ return TEST_ERROR;
+ }
}
/* use syscall() to force clone over clone2 */
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:13
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/syscalls/syscall_functions.bash | 4 +--
audit-test/utils/bin/do_bind.c | 49 +++++++++++++++++++++---------
2 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/audit-test/syscalls/syscall_functions.bash b/audit-test/syscalls/syscall_functions.bash
index 161331e..bd38b40 100644
--- a/audit-test/syscalls/syscall_functions.bash
+++ b/audit-test/syscalls/syscall_functions.bash
@@ -715,8 +715,8 @@ function create_io_objects_cap {
io_priv)
flag=1 ;; # process io privilege level
port_priv)
- target=24 # site-dependent mail handling, unused
- flag=0 # INADDR_ANY
+ target=0.0.0.0 # INADDR_ANY
+ flag=24 # site-dependent mail handling, unused
[[ -n $op ]] && augrokfunc=augrok_op ;;
fio_fibmap)
create_file target mode="a+rwx"
diff --git a/audit-test/utils/bin/do_bind.c b/audit-test/utils/bin/do_bind.c
index 1e77bd6..f6bfe75 100644
--- a/audit-test/utils/bin/do_bind.c
+++ b/audit-test/utils/bin/do_bind.c
@@ -16,33 +16,54 @@
#include "includes.h"
#include <sys/socket.h>
#include <netinet/in.h>
-#include <linux/net.h>
+#include <arpa/inet.h>
+#include <linux/un.h> /* instead of <sys/un.h> for UNIX_PATH_MAX */
int main(int argc, char **argv)
{
int exitval, result;
int sockfd;
- struct sockaddr_in my_addr;
- socklen_t addrlen = sizeof(my_addr);
+ union {
+ struct sockaddr_in in;
+ struct sockaddr_un un;
+ } addr;
+ socklen_t addrlen;
+ int domain;
- if (argc != 3) {
- fprintf(stderr, "Usage:\n%s <port> <0|127>\n", argv[0]);
- return 1;
+ if (argc < 2) {
+ fprintf(stderr, "Usage:\n"
+ "%s <address> [port]\n"
+ "%s <unix_path>\n",
+ argv[0], argv[0]);
+ return 1;
}
- memset(&my_addr, 0, addrlen);
- my_addr.sin_family = AF_INET;
- my_addr.sin_port = htons(atoi(argv[1]));
- my_addr.sin_addr.s_addr = atoi(argv[2]);
+ /* try ipv4 addr first, fallback to unix domain sockets */
+ if (inet_aton(argv[1], NULL)) {
+ domain = PF_INET;
+ addrlen = sizeof(struct sockaddr_in);
+ memset(&addr, 0, addrlen);
+ addr.in.sin_family = AF_INET;
+ if (argc >= 3)
+ addr.in.sin_port = htons(atoi(argv[2]));
+ printf("%d\n", ntohs(addr.in.sin_port));
+ inet_aton(argv[1], &addr.in.sin_addr);
+ } else {
+ domain = PF_UNIX;
+ addrlen = sizeof(struct sockaddr_un);
+ memset(&addr, 0, addrlen);
+ addr.un.sun_family = AF_UNIX;
+ strncpy(addr.un.sun_path, argv[1], UNIX_PATH_MAX);
+ }
- sockfd = socket(PF_INET, SOCK_STREAM, 0);
+ sockfd = socket(domain, SOCK_STREAM, 0);
if (sockfd < 0) {
- perror("do_bind: open socket");
- return TEST_ERROR;
+ perror("do_bind: open socket");
+ return TEST_ERROR;
}
errno = 0;
- exitval = bind(sockfd, (struct sockaddr *)&my_addr, addrlen);
+ exitval = bind(sockfd, (struct sockaddr *)&addr, addrlen);
result = exitval < 0;
printf("%d %d %d\n", result, result ? errno : exitval, getpid());
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:07
|
This avoids the EOPNOTSUPP error.
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_send.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/audit-test/utils/bin/do_send.c b/audit-test/utils/bin/do_send.c
index 573b0b3..8a25675 100644
--- a/audit-test/utils/bin/do_send.c
+++ b/audit-test/utils/bin/do_send.c
@@ -20,7 +20,7 @@
int main(int argc, char **argv)
{
- int rc, result, sflgs;
+ int rc, result, sflgs = 0;
struct addrinfo *host = NULL;
struct addrinfo addr_hints;
int sock;
@@ -34,6 +34,7 @@ int main(int argc, char **argv)
if (strcasecmp(argv[2], "tcp") == 0) {
addr_hints.ai_socktype = SOCK_STREAM;
addr_hints.ai_protocol = IPPROTO_TCP;
+ sflgs |= MSG_OOB;
} else if (strcasecmp(argv[2], "udp") == 0) {
addr_hints.ai_socktype = SOCK_DGRAM;
addr_hints.ai_protocol = IPPROTO_UDP;
@@ -52,8 +53,6 @@ int main(int argc, char **argv)
return TEST_ERROR;
errno = 0;
- sflgs = 0;
- sflgs |= MSG_OOB;
rc = send(sock, MSG_STRING, MSG_LEN, sflgs);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:45:03
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_mq_open.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/audit-test/utils/bin/do_mq_open.c b/audit-test/utils/bin/do_mq_open.c
index 8d0ec9d..85bdf5e 100644
--- a/audit-test/utils/bin/do_mq_open.c
+++ b/audit-test/utils/bin/do_mq_open.c
@@ -23,16 +23,22 @@ int main(int argc, char **argv)
{
int exitval, result;
int flags = 0;
+ mode_t mode = S_IRWXU;
if (argc < 3) {
- fprintf(stderr, "Usage:\n%s <path> <create|read|write|rdwr> [context]\n",
- argv[0]);
+ fprintf(stderr, "Usage:\n"
+ "%s <path> <create|create:mode|read|write|rdwr> [context]\n",
+ argv[0]);
return 1;
}
if (!strcmp(argv[2], "create")) {
/* use O_EXCL on create to catch cleanup problems */
flags |= O_CREAT|O_EXCL;
+ } else if (!strncmp(argv[2], "create:", 7)) {
+ /* create with custom mode */
+ flags |= O_CREAT|O_EXCL;
+ mode = strtol(argv[2]+7, NULL, 8);
} else if (!strcmp(argv[2], "read")) {
flags |= O_RDONLY;
} else if (!strcmp(argv[2], "write")) {
@@ -40,8 +46,6 @@ int main(int argc, char **argv)
} else if (!strcmp(argv[2], "rdwr")) {
flags |= O_RDWR;
} else {
- fprintf(stderr, "Usage:\n%s <path> <create|read|write|rdwr> [context]\n",
- argv[0]);
return 1;
}
@@ -53,7 +57,7 @@ int main(int argc, char **argv)
#endif
errno = 0;
- exitval = mq_open(argv[1], flags, S_IRWXU, NULL);
+ exitval = mq_open(argv[1], flags, mode, NULL);
result = exitval < 0;
printf("%d %d %d\n", result, result ? errno : exitval, getpid());
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:44:59
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/ipc_common.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/audit-test/utils/bin/ipc_common.c b/audit-test/utils/bin/ipc_common.c
index 359569f..2c93e4d 100644
--- a/audit-test/utils/bin/ipc_common.c
+++ b/audit-test/utils/bin/ipc_common.c
@@ -77,10 +77,8 @@ int translate_ipc_flags(char *string, int *flags)
*flags |= IPC_RMID;
else if (!strcmp(string, "set"))
*flags |= IPC_SET;
- else {
- fprintf(stderr, "ipc flag must be one of <create|read|write|rdwr|remove|set>\n");
- return 1;
- }
+ else
+ *flags |= atoi(string);
return 0;
}
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:44:56
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/ipc_common.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/audit-test/utils/bin/ipc_common.c b/audit-test/utils/bin/ipc_common.c
index 32db2ae..359569f 100644
--- a/audit-test/utils/bin/ipc_common.c
+++ b/audit-test/utils/bin/ipc_common.c
@@ -159,6 +159,9 @@ int do_msgctl(int msqid, int cmd)
buf.msg_perm.uid = 0; /* use root's uid */
ret = msgctl(msqid, cmd, &buf);
break;
+ case IPC_STAT:
+ ret = msgctl(msqid, cmd, &buf);
+ break;
}
return ret;
}
@@ -231,6 +234,9 @@ int do_semctl(int semid, int cmd)
((struct semid_ds *)sebuf.buf)->sem_perm.uid = 0; /* use root's uid */
ret = semctl(semid, 1, cmd, sebuf);
break;
+ case IPC_STAT:
+ ret = semctl(semid, 1, cmd, &sebuf);
+ break;
}
return ret;
}
@@ -280,6 +286,9 @@ int do_shmctl(int shmid, int cmd)
buf.shm_perm.uid = 0; /* use root's uid */
ret = shmctl(shmid, cmd, &buf);
break;
+ case IPC_STAT:
+ ret = shmctl(shmid, cmd, &buf);
+ break;
}
return ret;
}
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:44:53
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/ipc_common.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/audit-test/utils/bin/ipc_common.c b/audit-test/utils/bin/ipc_common.c
index 02f4977..32db2ae 100644
--- a/audit-test/utils/bin/ipc_common.c
+++ b/audit-test/utils/bin/ipc_common.c
@@ -61,6 +61,12 @@ int translate_ipc_flags(char *string, int *flags)
if (!strcmp(string, "create"))
/* use IPC_EXCL on create to catch cleanup problems */
*flags |= IPC_CREAT|IPC_EXCL|S_IRUSR|S_IWUSR;
+ else if (!strncmp(string, "create:", strlen("create:"))) {
+ /* create with custom mode */
+ *flags |= IPC_CREAT|IPC_EXCL;
+ *flags &= ~((int)0x01ff); /* reset 9 lsbits */
+ *flags |= strtol(string+strlen("create:"), NULL, 8);
+ }
else if (!strcmp(string, "read"))
*flags |= S_IRUSR;
else if (!strcmp(string, "write"))
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:44:49
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_ipc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/audit-test/utils/bin/do_ipc.c b/audit-test/utils/bin/do_ipc.c
index d845e05..6d1d7ee 100644
--- a/audit-test/utils/bin/do_ipc.c
+++ b/audit-test/utils/bin/do_ipc.c
@@ -22,7 +22,7 @@ int main(int argc, char **argv)
int exitval, result;
int op, flags = 0;
- if (argc < 1) {
+ if (argc < 2) {
fprintf(stderr, "%s: you must specify an ipc operation\n", argv[0]);
return 1;
}
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:44:46
|
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/utils/bin/do_send.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/audit-test/utils/bin/do_send.c b/audit-test/utils/bin/do_send.c
index cefb3b9..573b0b3 100644
--- a/audit-test/utils/bin/do_send.c
+++ b/audit-test/utils/bin/do_send.c
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
errno = 0;
sflgs = 0;
sflgs |= MSG_OOB;
- rc = sendto(sock, MSG_STRING, MSG_LEN, sflgs, host->ai_addr, host->ai_addrlen);
+ rc = send(sock, MSG_STRING, MSG_LEN, sflgs);
result = (rc < 0 ? TEST_FAIL : TEST_SUCCESS);
printf("%d %d %d\n", result, result ? errno : rc, getpid());
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:44:35
|
The group may have been removed by userdel due to 'USERGROUPS_ENAB yes'
being set in login.defs.
If - in delete_user - the last groupdel fails, its non-0
return value is carried as a function return value back
to the parent shell and is evaluated as ERROR, so return 0
explicitly.
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/misc/tests/test_procperm.bash | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/audit-test/misc/tests/test_procperm.bash b/audit-test/misc/tests/test_procperm.bash
index 554d9f5..7cb55c0 100755
--- a/audit-test/misc/tests/test_procperm.bash
+++ b/audit-test/misc/tests/test_procperm.bash
@@ -49,6 +49,8 @@ function create_user(){
echo "Could not add test user $TEST_USER."
exit 1
fi
+
+ return 0
}
#-----------------------------------------------------------------------
@@ -60,12 +62,15 @@ function delete_user(){
killall -9 -u $TEST_USER
userdel -rf $TEST_USER >& /dev/null
- groupdel $TEST_USER >& /dev/null
if [ "$?" != "0" ]; then
echo "Not able to delete test user $TEST_USER."
exit 1
fi
+
+ groupdel $TEST_USER >& /dev/null
+
+ return 0
}
#
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:44:33
|
- use killall -9 on all processes of the test users, to kill
leftover processes that might be running (ie. when the test
fails on an unexpected exception)
- use userdel -rf instead of removing homedir, mail spool
and cron spool manually, the `-f' should be unnecessary,
but makes the removal process a bit more robust in case
there are leftover zombies (stuck in a syscall)
Without this change, ls /var/spool/mail:
cg_user1 cg_user2 cs_user1 cs_user2 eal eal2 joe ll_user
pd_user1 pd_user2 rpc
Signed-off-by: Jiri Jaburek <jja...@re...>
---
audit-test/kvm/test_libvirt_access.bash | 4 ++--
audit-test/kvm/test_libvirt_access_ssh.bash | 4 ++--
audit-test/kvm/test_selinux_chcon_resource.bash | 4 ++--
audit-test/libpam/tests/test_sudo.bash | 16 +++++++++-------
audit-test/misc/tests/test_ipc_permission.bash | 11 ++++-------
audit-test/misc/tests/test_procperm.bash | 11 ++++-------
audit-test/netfilebt/testperm.bash | 6 ++++--
audit-test/netfilter/testpermip4.bash | 6 ++++--
audit-test/netfilter/testpermip6.bash | 6 ++++--
audit-test/trustedprograms/tests/cron_functions.bash | 19 ++++---------------
audit-test/trustedprograms/tests/lastlog01 | 10 ++++------
audit-test/trustedprograms/tests/test_usermod_l.bash | 2 +-
.../trustedprograms/tests/tp_auth_functions.bash | 2 +-
audit-test/trustedprograms/tests/utils.plib | 2 ++
audit-test/utils/run.bash | 8 +++++---
15 files changed, 52 insertions(+), 59 deletions(-)
diff --git a/audit-test/kvm/test_libvirt_access.bash b/audit-test/kvm/test_libvirt_access.bash
index d4eba93..2018f6b 100755
--- a/audit-test/kvm/test_libvirt_access.bash
+++ b/audit-test/kvm/test_libvirt_access.bash
@@ -28,7 +28,7 @@ source testcase.bash || exit 2
set -x
-append_cleanup "userdel -fr -Z testuser1"
+append_cleanup "killall -9 -u testuser1; userdel -fr -Z testuser1"
append_cleanup "groupdel testuser1"
userdel -fr -Z testuser1
groupdel testuser1
@@ -38,7 +38,7 @@ if [[ $? -ne 0 ]]; then
exit_error
fi
-append_cleanup "userdel -fr -Z testuser2"
+append_cleanup "killall -9 -u testuser2; userdel -fr -Z testuser2"
append_cleanup "groupdel testuser2"
userdel -fr -Z testuser2
groupdel testuser2
diff --git a/audit-test/kvm/test_libvirt_access_ssh.bash b/audit-test/kvm/test_libvirt_access_ssh.bash
index 00ad5dd..20fbfa6 100755
--- a/audit-test/kvm/test_libvirt_access_ssh.bash
+++ b/audit-test/kvm/test_libvirt_access_ssh.bash
@@ -28,7 +28,7 @@ source testcase.bash || exit 2
set -x
-append_cleanup "userdel -fr -Z testuser1"
+append_cleanup "killall -9 -u testuser1; userdel -fr -Z testuser1"
append_cleanup "groupdel testuser1"
userdel -fr -Z testuser1
groupdel testuser1
@@ -38,7 +38,7 @@ if [[ $? -ne 0 ]]; then
exit_error
fi
-append_cleanup "userdel -fr -Z testuser2"
+append_cleanup "killall -9 -u testuser2; userdel -fr -Z testuser2"
append_cleanup "groupdel testuser2"
userdel -fr -Z testuser2
groupdel testuser2
diff --git a/audit-test/kvm/test_selinux_chcon_resource.bash b/audit-test/kvm/test_selinux_chcon_resource.bash
index edf4517..9ffa11a 100755
--- a/audit-test/kvm/test_selinux_chcon_resource.bash
+++ b/audit-test/kvm/test_selinux_chcon_resource.bash
@@ -27,7 +27,7 @@ source testcase.bash || exit 2
set -x
-append_cleanup "userdel -fr testuser1"
+append_cleanup "killall -9 -u testuser1; userdel -fr testuser1"
append_cleanup "groupdel testuser1"
userdel -fr testuser1
groupdel testuser1
@@ -37,7 +37,7 @@ if [[ $? -ne 0 ]]; then
exit_error
fi
-append_cleanup "userdel -fr testuser2"
+append_cleanup "killall -9 -u testuser2; userdel -fr testuser2"
append_cleanup "groupdel testuser2"
userdel -fr testuser2
groupdel testuser2
diff --git a/audit-test/libpam/tests/test_sudo.bash b/audit-test/libpam/tests/test_sudo.bash
index 5bd48f6..1a2f5ed 100755
--- a/audit-test/libpam/tests/test_sudo.bash
+++ b/audit-test/libpam/tests/test_sudo.bash
@@ -206,18 +206,20 @@ CMD_RET_p4=0
source pam_functions.bash || exit 2
setup_cleanup() {
- prepend_cleanup "rm -rf /home/$USERG /home/$USERO /home/$USERT /var/mail/$USERG /var/mail/$USERO /var/mail/$USERT"
prepend_cleanup "rm -f /etc/sudoers.new"
prepend_cleanup "groupdel $GROUP"
- prepend_cleanup "userdel $USERT"
- prepend_cleanup "userdel $USERO"
- prepend_cleanup "userdel $USERG"
+ prepend_cleanup "killall -9 -u $USERT; userdel -rf $USERT"
+ prepend_cleanup "killall -9 -u $USERO; userdel -rf $USERO"
+ prepend_cleanup "killall -9 -u $USERG; userdel -rf $USERG"
}
gen_user() {
- userdel $USERG 2> /dev/null
- userdel $USERO 2> /dev/null
- userdel $USERT 2> /dev/null
+ killall -9 -u $USERG
+ killall -9 -u $USERO
+ killall -9 -u $USERT
+ userdel -rf $USERG 2> /dev/null
+ userdel -rf $USERO 2> /dev/null
+ userdel -rf $USERT 2> /dev/null
groupdel $GROUP 2> /dev/null
groupadd $GROUP
useradd -u $USERG_ID -g $GROUP -p $PASSENC $USERG
diff --git a/audit-test/misc/tests/test_ipc_permission.bash b/audit-test/misc/tests/test_ipc_permission.bash
index 664a151..bc5ab20 100755
--- a/audit-test/misc/tests/test_ipc_permission.bash
+++ b/audit-test/misc/tests/test_ipc_permission.bash
@@ -41,9 +41,8 @@ TEST_USER2="permtest3"
function create_user(){
echo "Creating test user $TEST_USER2..."
if egrep "^$TEST_USER2" /etc/passwd; then
- userdel $TEST_USER2 >& /dev/null
- [ -d "home/$TEST_USER2" ] && rm -rf /home/$TEST_USER2
- sleep 1
+ killall -9 -u $TEST_USER2
+ userdel -rf $TEST_USER2
fi
useradd -g $TEST_USER2 $TEST_USER2
@@ -72,10 +71,8 @@ function create_group(){
function delete_user(){
echo "Deleting test user $TEST_USER2..."
- userdel -r $TEST_USER2 >& /dev/null
- [ -d "/home/$TEST_USER2" ] && rm -rf /home/$TEST_USER2
-
- sleep 1
+ killall -9 -u $TEST_USER2
+ userdel -rf $TEST_USER2 >& /dev/null
if [ "$?" != "0" ]; then
echo "Not able to delete test user $TEST_USER2."
exit 1
diff --git a/audit-test/misc/tests/test_procperm.bash b/audit-test/misc/tests/test_procperm.bash
index 0074bcb..554d9f5 100755
--- a/audit-test/misc/tests/test_procperm.bash
+++ b/audit-test/misc/tests/test_procperm.bash
@@ -39,11 +39,9 @@ function create_user(){
echo "Creating test user $TEST_USER..."
#erase user if he may exist , so we can have a clean env
- userdel $TEST_USER >& /dev/null
+ killall -9 -u $TEST_USER
+ userdel -rf $TEST_USER >& /dev/null
groupdel $TEST_USER >& /dev/null
- [ -d "/home/$TEST_USER" ] && rm -rf /home/$TEST_USER
-
- sleep 1
useradd -m -p "$TEST_USER_ENCRYPTED_PASSWD" $TEST_USER
@@ -60,10 +58,9 @@ function create_user(){
function delete_user(){
echo "Deleting test user $TEST_USER..."
- userdel $TEST_USER >& /dev/null
- sleep 1
+ killall -9 -u $TEST_USER
+ userdel -rf $TEST_USER >& /dev/null
groupdel $TEST_USER >& /dev/null
- [ -d "/home/$TEST_USER" ] && rm -rf /home/$TEST_USER
if [ "$?" != "0" ]; then
echo "Not able to delete test user $TEST_USER."
diff --git a/audit-test/netfilebt/testperm.bash b/audit-test/netfilebt/testperm.bash
index 88300df..888e9ae 100755
--- a/audit-test/netfilebt/testperm.bash
+++ b/audit-test/netfilebt/testperm.bash
@@ -32,12 +32,14 @@ useradd -m -p usertest "$TEST_USER"
rc=$?
if [[ $rc -ne 0 ]]; then
echo "operation not permitted, return code is $rc"
- userdel -r "$TEST_USER" &>/dev/null
+ killall -9 -u "$TEST_USER"
+ userdel -rf "$TEST_USER" &>/dev/null
ebtables -L
exit_pass
else
echo "test failed, ebtables operation permitted"
- userdel -r "$TEST_USER" &>/dev/null
+ killall -9 -u "$TEST_USER"
+ userdel -rf "$TEST_USER" &>/dev/null
ebtables -L
exit_fail
fi
diff --git a/audit-test/netfilter/testpermip4.bash b/audit-test/netfilter/testpermip4.bash
index 26a86ab..5787012 100755
--- a/audit-test/netfilter/testpermip4.bash
+++ b/audit-test/netfilter/testpermip4.bash
@@ -14,12 +14,14 @@ useradd -m -p usertest "$TEST_USER"
rc=$?
if [[ $rc -ne 0 ]]; then
echo "operation not permitted, return code is $rc"
- userdel -r "$TEST_USER" &>/dev/null
+ killall -9 -u "$TEST_USER"
+ userdel -rf "$TEST_USER" &>/dev/null
ebtables -L
exit_pass
else
echo "test failed, ebtables operation permitted"
- userdel -r "$TEST_USER" &>/dev/null
+ killall -9 -u "$TEST_USER"
+ userdel -rf "$TEST_USER" &>/dev/null
ebtables -L
exit_fail
fi
diff --git a/audit-test/netfilter/testpermip6.bash b/audit-test/netfilter/testpermip6.bash
index b8b5535..9524d33 100755
--- a/audit-test/netfilter/testpermip6.bash
+++ b/audit-test/netfilter/testpermip6.bash
@@ -13,12 +13,14 @@ useradd -m -p usertest "$TEST_USER"
rc=$?
if [[ $rc -ne 0 ]]; then
echo "operation not permitted, return code is $rc"
- userdel -r "$TEST_USER" &>/dev/null
+ killall -9 -u "$TEST_USER"
+ userdel -rf "$TEST_USER" &>/dev/null
ebtables -L
exit_pass
else
echo "test failed, ebtables operation permitted"
- userdel -r "$TEST_USER" &>/dev/null
+ killall -9 -u "$TEST_USER"
+ userdel -rf "$TEST_USER" &>/dev/null
ebtables -L
exit_fail
fi
diff --git a/audit-test/trustedprograms/tests/cron_functions.bash b/audit-test/trustedprograms/tests/cron_functions.bash
index e8da274..3491941 100644
--- a/audit-test/trustedprograms/tests/cron_functions.bash
+++ b/audit-test/trustedprograms/tests/cron_functions.bash
@@ -59,20 +59,9 @@ function cleanup {
crontab -r -u $TEST_USER
fi
- if [ -d "/home/$TEST_USER2" ]; then
- userdel $TEST_USER2
- rm -rf /home/$TEST_USER2
- fi
+ killall -9 -u $TEST_USER2
+ userdel -rf $TEST_USER2 2>/dev/null
- if [ -d "$TEST_DIR" ]; then
- rm -rf $TEST_DIR
- fi
-
- if [ -e "$CRON_ALLOW" ]; then
- rm -f $CRON_ALLOW
- fi
-
- if [ -e "$CRON_DENY" ]; then
- rm -f $CRON_DENY
- fi
+ rm -rf $TEST_DIR
+ rm -f $CRON_ALLOW $CRON_DENY
}
diff --git a/audit-test/trustedprograms/tests/lastlog01 b/audit-test/trustedprograms/tests/lastlog01
index e559970..047a368 100755
--- a/audit-test/trustedprograms/tests/lastlog01
+++ b/audit-test/trustedprograms/tests/lastlog01
@@ -34,7 +34,6 @@ RHOST="localhost"
TEST_USER='ll_user'
TEST_USER_PASSWD='ltP_t3st*_pass'
TEST_USER_ENCRYPTED_PASSWD='$6$mdf9vvfz$2hQcpjsaKz21PUmjoVfLT23XZb/HbFEKmK6GePHj3arBU2cadAmVDcakSU9HgjaI0u.yzx.XAS3hNXZLtuCZ1.'
-TEST_USER_HOMEDIR="/home/$TEST_USER"
TEST=0
#-----------------------------------------------------------------------
@@ -46,9 +45,8 @@ create_user(){
echo "Creating test user $TEST_USER..."
#erase user if he may exist , so we can have a clean env
- rm -rf /home/$TEST_USER
- userdel $TEST_USER
- sleep 1
+ killall -9 -u $TEST_USER
+ userdel -rf $TEST_USER
useradd -m -p "$TEST_USER_ENCRYPTED_PASSWD" -g users $TEST_USER
@@ -67,8 +65,8 @@ create_user(){
delete_user(){
echo "Deleting test user $TEST_USER..."
- rm -rf /home/$TEST_USER
- userdel $TEST_USER
+ killall -9 -u $TEST_USER
+ userdel -rf $TEST_USER
if [ $? != 0 ]
then
echo "Not able to delete test user $TEST_USER."
diff --git a/audit-test/trustedprograms/tests/test_usermod_l.bash b/audit-test/trustedprograms/tests/test_usermod_l.bash
index b91610d..452c5c6 100755
--- a/audit-test/trustedprograms/tests/test_usermod_l.bash
+++ b/audit-test/trustedprograms/tests/test_usermod_l.bash
@@ -23,7 +23,7 @@ source tp_auth_functions.bash || exit 2
# setup
useradd -n -G games -u $uid $user || exit_error "groupadd failed"
read user2 uid2 <<<"$(generate_unique_user)"
-prepend_cleanup "userdel -r $user2"
+prepend_cleanup "killall -9 -u $user2; userdel -rf $user2"
# test
setpid usermod -l $user2 $user || exit_error "usermod failed"
diff --git a/audit-test/trustedprograms/tests/tp_auth_functions.bash b/audit-test/trustedprograms/tests/tp_auth_functions.bash
index 9f0ffee..4792216 100644
--- a/audit-test/trustedprograms/tests/tp_auth_functions.bash
+++ b/audit-test/trustedprograms/tests/tp_auth_functions.bash
@@ -82,7 +82,7 @@ function user_cleanup {
read group gid <<<"$(generate_unique_group)"
read user uid <<<"$(generate_unique_user)"
-prepend_cleanup "grep -q '^$user:' /etc/passwd && { killall -9 -u '$user' ; userdel -r '$user'; }"
+prepend_cleanup "grep -q '^$user:' /etc/passwd && { killall -9 -u '$user' ; userdel -rf '$user'; }"
prepend_cleanup "grep -q '^$group:' /etc/group && groupdel '$group'"
set -x
diff --git a/audit-test/trustedprograms/tests/utils.plib b/audit-test/trustedprograms/tests/utils.plib
index 75f4cb8..2c58855 100755
--- a/audit-test/trustedprograms/tests/utils.plib
+++ b/audit-test/trustedprograms/tests/utils.plib
@@ -13,6 +13,7 @@ sub create_user($) {
if ( ! $username ) {
return -1;
}
+ `killall -9 -u '$username'`;
`userdel -rf '$username' 2>/dev/null`;
`useradd -m -g users '$username'`;
if ($? != 0) {
@@ -27,6 +28,7 @@ sub delete_user($) {
return -1;
}
clear_oldpassword();
+ `killall -9 -u '$username'`;
`userdel -rf '$username'`;
if ($? != 0) {
die("ERROR $?: Cannot delete user $username");
diff --git a/audit-test/utils/run.bash b/audit-test/utils/run.bash
index 721e744..7106479 100755
--- a/audit-test/utils/run.bash
+++ b/audit-test/utils/run.bash
@@ -247,7 +247,8 @@ function startup {
killall -HUP auditd # reload config when auditd was already running
# Add the test user which is used for unprivileged tests
- userdel -r "$TEST_USER" &>/dev/null
+ killall -9 -u "$TEST_USER"
+ userdel -Z -rf "$TEST_USER" &>/dev/null
groupdel "$TEST_USER" &>/dev/null
dmsg "Adding group $TEST_USER"
groupadd "$TEST_USER" || die
@@ -257,7 +258,8 @@ function startup {
faillock --user "$TEST_USER" --reset
# Add the test user which is in sysadm_r
- userdel -r "$TEST_ADMIN" &>/dev/null
+ killall -9 -u "$TEST_ADMIN"
+ userdel -Z -rf "$TEST_ADMIN" &>/dev/null
groupdel "$TEST_ADMIN" &>/dev/null
dmsg "Adding group $TEST_ADMIN"
groupadd "$TEST_ADMIN" || die
@@ -289,7 +291,7 @@ function cleanup {
killall -9 -u "$RUSER"
# Remove the test user
dmsg "Removing user $RUSER"
- userdel -Z -r "$RUSER" &>/dev/null
+ userdel -Z -rf "$RUSER" &>/dev/null
dmsg "Removing group $RUSER"
groupdel "$RUSER" &>/dev/null
# Cleanup polyinstantiated home directory
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:44:28
|
From: Ondrej Moris <om...@re...>
On a virtual machines it might happen due to potential caching of
/var/log/audit mounted on tmpfs that /sbin/init is called too many
times during disk_full halt and single tests. This caused very long
testing time and due to imjournal rate-limit it moreover caused
imjournal to drop messages. With this commit we kill audisp-remote
(causing /sbin/init to be triggered) as soon as possible (ie. after
first execution of /sbin/init) from /sbin/init itself.
Signed-off-by: Ondrej Moris <om...@re...>
---
audit-test/audit-remote/tests/audisp-remote_functions.bash | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/audit-test/audit-remote/tests/audisp-remote_functions.bash b/audit-test/audit-remote/tests/audisp-remote_functions.bash
index f64c420..dcbca67 100644
--- a/audit-test/audit-remote/tests/audisp-remote_functions.bash
+++ b/audit-test/audit-remote/tests/audisp-remote_functions.bash
@@ -541,6 +541,10 @@ pre_halt() {
#!/bin/bash -x
if [[ \$1 == $mask_runlevel ]]; then
logger "audisp-remote_testing: $$ runlevel=\$1"
+
+ # Since /sbin/init might be executed many times, we should
+ # kill audisp-remote to avoid unpleasant chain-reaction
+ killall -q audisp-remote
else
exec /sbin/init.audisp-remote_testing "\$@"
fi
--
1.8.3.1
|
|
From: Jiri J. <jja...@re...> - 2014-09-23 09:44:26
|
From: Miroslav Vadkerti <mva...@re...> Recent changes in run.bash are not sh compatible, use bash instead. Signed-off-by: Miroslav Vadkerti <mva...@re...> --- audit-test/audit-tools/tests/test_auditd_reload | 2 +- audit-test/audit-tools/tests/test_auditd_restart | 2 +- audit-test/audit-tools/tests/test_auditd_start | 2 +- audit-test/audit-tools/tests/test_auditd_status | 2 +- audit-test/audit-tools/tests/test_auditd_stop | 2 +- audit-test/misc/tests/procpermtest.sh | 2 +- audit-test/misc/tests/test_ipc_permission.bash | 2 +- audit-test/misc/tests/test_objreuse.bash | 2 +- audit-test/misc/tests/test_permission.bash | 2 +- audit-test/misc/tests/test_procperm.bash | 2 +- audit-test/misc/tests/test_sys_procperms.bash | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/audit-test/audit-tools/tests/test_auditd_reload b/audit-test/audit-tools/tests/test_auditd_reload index c23f6bc..551aee5 100755 --- a/audit-test/audit-tools/tests/test_auditd_reload +++ b/audit-test/audit-tools/tests/test_auditd_reload @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # ============================================================================= # (c) Copyright Hewlett-Packard Development Company, L.P., 2011 diff --git a/audit-test/audit-tools/tests/test_auditd_restart b/audit-test/audit-tools/tests/test_auditd_restart index ab6b2d0..65dc5c7 100755 --- a/audit-test/audit-tools/tests/test_auditd_restart +++ b/audit-test/audit-tools/tests/test_auditd_restart @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # ============================================================================= # (c) Copyright Hewlett-Packard Development Company, L.P., 2011 diff --git a/audit-test/audit-tools/tests/test_auditd_start b/audit-test/audit-tools/tests/test_auditd_start index 83093f8..7f4fd6c 100755 --- a/audit-test/audit-tools/tests/test_auditd_start +++ b/audit-test/audit-tools/tests/test_auditd_start @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # ============================================================================= # (c) Copyright Hewlett-Packard Development Company, L.P., 2011 diff --git a/audit-test/audit-tools/tests/test_auditd_status b/audit-test/audit-tools/tests/test_auditd_status index ad7e880..74e70ba 100755 --- a/audit-test/audit-tools/tests/test_auditd_status +++ b/audit-test/audit-tools/tests/test_auditd_status @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # ============================================================================= # (c) Copyright Hewlett-Packard Development Company, L.P., 2011 diff --git a/audit-test/audit-tools/tests/test_auditd_stop b/audit-test/audit-tools/tests/test_auditd_stop index 86eeb93..cc6b849 100755 --- a/audit-test/audit-tools/tests/test_auditd_stop +++ b/audit-test/audit-tools/tests/test_auditd_stop @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # ============================================================================= # (c) Copyright Hewlett-Packard Development Company, L.P., 2011 diff --git a/audit-test/misc/tests/procpermtest.sh b/audit-test/misc/tests/procpermtest.sh index ee0dea0..d41920e 100755 --- a/audit-test/misc/tests/procpermtest.sh +++ b/audit-test/misc/tests/procpermtest.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # #********************************************************************* # Copyright (C) International Business Machines Corp., 2000 diff --git a/audit-test/misc/tests/test_ipc_permission.bash b/audit-test/misc/tests/test_ipc_permission.bash index 84e8052..664a151 100755 --- a/audit-test/misc/tests/test_ipc_permission.bash +++ b/audit-test/misc/tests/test_ipc_permission.bash @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # #********************************************************************* # Copyright (C) International Business Machines Corp., 2000 diff --git a/audit-test/misc/tests/test_objreuse.bash b/audit-test/misc/tests/test_objreuse.bash index 13d83e5..33399a3 100755 --- a/audit-test/misc/tests/test_objreuse.bash +++ b/audit-test/misc/tests/test_objreuse.bash @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # #********************************************************************* # Copyright (C) International Business Machines Corp., 2000 diff --git a/audit-test/misc/tests/test_permission.bash b/audit-test/misc/tests/test_permission.bash index 129e0c5..8cbf775 100755 --- a/audit-test/misc/tests/test_permission.bash +++ b/audit-test/misc/tests/test_permission.bash @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # #********************************************************************* # Copyright (C) International Business Machines Corp., 2000 diff --git a/audit-test/misc/tests/test_procperm.bash b/audit-test/misc/tests/test_procperm.bash index 1a40065..0074bcb 100755 --- a/audit-test/misc/tests/test_procperm.bash +++ b/audit-test/misc/tests/test_procperm.bash @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # #********************************************************************* # Copyright (C) International Business Machines Corp., 2000 diff --git a/audit-test/misc/tests/test_sys_procperms.bash b/audit-test/misc/tests/test_sys_procperms.bash index ca5a497..777bbf1 100755 --- a/audit-test/misc/tests/test_sys_procperms.bash +++ b/audit-test/misc/tests/test_sys_procperms.bash @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # #********************************************************************* # Copyright (C) International Business Machines Corp., 2000 -- 1.8.3.1 |
5 messages has been excluded from this view by a project administrator.
