PERFORCE change 156381 for review
Robert Watson
rwatson at FreeBSD.org
Mon Jan 19 03:14:16 PST 2009
http://perforce.freebsd.org/chv.cgi?CH=156381
Change 156381 by rwatson at rwatson_freebsd_capabilities on 2009/01/19 11:13:20
More decisively call pdwait4() pdwait().
Affected files ...
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#23 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#9 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#24 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#16 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#24 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#20 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#24 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#24 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#24 edit
Differences ...
==== //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pdfork.2#2 (text+ko) ====
@@ -52,7 +52,7 @@
.Ft int
.Fn pdkill "int fd" "int signum"
.Ft int
-.Fn pdwait4 "int fd" "int *status" "int options" "struct rusage *rusage"
+.Fn pdwait "int fd" "int *status" "int options" "struct rusage *rusage"
.Sh DESCRIPTION
Process descriptors are special file descriptors that represent processes,
and are created using
@@ -74,7 +74,7 @@
.Fa fd ,
rather than a PID.
.Pp
-.Fn pdwait4
+.Fn pdwait
is currently unimplemented, but in the future will be functionally identical
to
.Xr wait4 ,
@@ -111,7 +111,7 @@
.Tn TrustedBSD
Project.
.Sh BUGS
-.Fn pdwait4
+.Fn pdwait
is not yet implemented.
.Pp
WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED ON IN
==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#23 (text+ko) ====
@@ -541,5 +541,5 @@
{ AS(pdfork_args), (sy_call_t *)pdfork, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 510 = pdfork */
{ AS(pdkill_args), (sy_call_t *)pdkill, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 511 = pdkill */
{ AS(pdgetpid_args), (sy_call_t *)pdgetpid, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 512 = pdgetpid */
- { AS(pdwait4_args), (sy_call_t *)pdwait4, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 513 = pdwait4 */
+ { AS(pdwait_args), (sy_call_t *)pdwait, AUE_NULL, NULL, 0, 0, 0 }, /* 513 = pdwait */
};
==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#9 (text+ko) ====
@@ -706,7 +706,7 @@
}
int
-pdwait4(struct thread *td, struct pdwait4_args *uap)
+pdwait(struct thread *td, struct pdwait_args *uap)
{
/* XXXRW: Not yet. */
==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#24 (text+ko) ====
@@ -520,5 +520,5 @@
"pdfork", /* 510 = pdfork */
"pdkill", /* 511 = pdkill */
"pdgetpid", /* 512 = pdgetpid */
- "pdwait4", /* 513 = pdwait4 */
+ "pdwait", /* 513 = pdwait */
};
==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#16 (text+ko) ====
@@ -913,7 +913,7 @@
510 AUE_NULL STD { int pdfork(int *fdp); }
511 AUE_NULL STD { int pdkill(int fd, int signum); }
512 AUE_NULL STD { int pdgetpid(int fd, pid_t *pidp); }
-513 AUE_NULL STD { int pdwait4(int fd, int *status, \
+513 AUE_NULL STD { int pdwait(int fd, int *status, \
int options, struct rusage *rusage); }
; Please copy any additions and changes to the following compatability tables:
==== //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#24 (text+ko) ====
@@ -3091,9 +3091,9 @@
*n_args = 2;
break;
}
- /* pdwait4 */
+ /* pdwait */
case 513: {
- struct pdwait4_args *p = params;
+ struct pdwait_args *p = params;
iarg[0] = p->fd; /* int */
uarg[1] = (intptr_t) p->status; /* int * */
iarg[2] = p->options; /* int */
@@ -8206,7 +8206,7 @@
break;
};
break;
- /* pdwait4 */
+ /* pdwait */
case 513:
switch(ndx) {
case 0:
==== //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#20 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#19 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#20 $
*/
/*
==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#24 (text+ko) ====
@@ -428,5 +428,5 @@
#define SYS_pdfork 510
#define SYS_pdkill 511
#define SYS_pdgetpid 512
-#define SYS_pdwait4 513
+#define SYS_pdwait 513
#define SYS_MAXSYSCALL 514
==== //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#24 (text+ko) ====
@@ -377,4 +377,4 @@
pdfork.o \
pdkill.o \
pdgetpid.o \
- pdwait4.o
+ pdwait.o
==== //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#24 (text+ko) ====
@@ -1650,7 +1650,7 @@
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char pidp_l_[PADL_(pid_t *)]; pid_t * pidp; char pidp_r_[PADR_(pid_t *)];
};
-struct pdwait4_args {
+struct pdwait_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
@@ -2017,7 +2017,7 @@
int pdfork(struct thread *, struct pdfork_args *);
int pdkill(struct thread *, struct pdkill_args *);
int pdgetpid(struct thread *, struct pdgetpid_args *);
-int pdwait4(struct thread *, struct pdwait4_args *);
+int pdwait(struct thread *, struct pdwait_args *);
#ifdef COMPAT_43
@@ -2618,7 +2618,7 @@
#define SYS_AUE_pdfork AUE_NULL
#define SYS_AUE_pdkill AUE_NULL
#define SYS_AUE_pdgetpid AUE_NULL
-#define SYS_AUE_pdwait4 AUE_NULL
+#define SYS_AUE_pdwait AUE_NULL
#undef PAD_
#undef PADL_
More information about the p4-projects
mailing list