PERFORCE change 146686 for review
Vincenzo Iozzo
snagg at FreeBSD.org
Tue Aug 5 09:30:39 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=146686
Change 146686 by snagg at snagg_macosx on 2008/08/05 09:30:33
Added testing cases for kill and setresuid.
Affected files ...
.. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#7 edit
.. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.h#5 edit
.. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_close.c#2 edit
.. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_kill.c#1 add
.. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_open.c#5 edit
.. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setgid.c#3 edit
.. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setresuid.c#1 add
.. //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setuid.c#3 edit
Differences ...
==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.c#7 (text+ko) ====
@@ -374,6 +374,7 @@
return 0;
}
+
/*
* Check the pid and privilege of a bsm-token
*/
@@ -387,6 +388,18 @@
}
/*
+ * Check the pid and privilege of an external process
+ */
+int check_ext_priv(au_proc32_t priv, struct ext_priv p)
+{
+ if(priv.pid == p.pid && priv.euid == p.euid && priv.ruid == p.ruid &&
+ priv.rgid == p.rgid && priv.egid == p.egid)
+ return 1;
+
+ return 0;
+}
+
+/*
* Check attributes of fd from a bsm-token
*/
int check_fd(au_attr32_t attr, int fd)
==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/audit_pipe_regression_test_utils.h#5 (text+ko) ====
@@ -82,6 +82,15 @@
int count;
};
+struct ext_priv
+{
+ int pid;
+ int euid;
+ int ruid;
+ int rgid;
+ int egid;
+};
+
void init_channel();
void init_channel_primary();
void end_channel();
==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_close.c#2 (text+ko) ====
@@ -272,7 +272,7 @@
if(count == INT_TYPE) {
if(!strncmp(descr, "fd", 2))
elem->fd = get_int(shared_string);
- else if (!strncmp(descr, "ret", 3))
+ else
elem->ret = get_int(shared_string);
}
else if ( count == STRING_TYPE)
==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_open.c#5 (text+ko) ====
@@ -204,7 +204,7 @@
break;
case AUT_ARG32:
- if(tok.tt.arg32.no == 2) {
+ if(tok.tt.arg32.no == 2) {
ret = check_arg(tok.tt.arg32, tmp->arg2);
if(!ret)
report_error(tok, f);
==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setgid.c#3 (text+ko) ====
@@ -113,7 +113,6 @@
{
int i, ret, reclen, bytesread, to_parse;
struct setgid_record *tmp, *elem;
- struct audit_record *p, *el;
int err = -1;
tokenstr_t tok;
u_char *buf;
@@ -245,7 +244,7 @@
if(count == INT_TYPE) {
if(!strncmp(descr, "gid", 3))
elem->gid = get_int(shared_string);
- else if (!strncmp(descr, "ret", 3))
+ else
elem->ret = get_int(shared_string);
}
else if ( count == STRING_TYPE)
==== //depot/projects/soc2008/snagg-audit/tools/regression/audit/audit_pipe/specific-event/audit_pipe_event_setuid.c#3 (text+ko) ====
@@ -245,7 +245,7 @@
if(count == INT_TYPE) {
if(!strncmp(descr, "uid", 3))
elem->uid = get_int(shared_string);
- else if (!strncmp(descr, "ret", 3))
+ else
elem->ret = get_int(shared_string);
}
else if ( count == STRING_TYPE)
More information about the p4-projects
mailing list