diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-12-06 17:50:22 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-12-06 17:50:22 +0000 |
| commit | bdfac6fb6d9c228b1e2bd1606d42f9f9879064ac (patch) | |
| tree | d96ed497cb33d9561511009ee5e3f6d0b6bccab4 /sys/kern | |
| parent | e233eb94bf25a3f79f0da8fcff65fa4cb88b3df7 (diff) | |
Change kernel internal pledge variables to 64bit (to prepare for more
extensions). This change is exposed in ktrace.out files
ok semarie
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_ktrace.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_pledge.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 14ed01c4bf6..aefc39319d3 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_ktrace.c,v 1.85 2015/12/05 10:11:53 tedu Exp $ */ +/* $OpenBSD: kern_ktrace.c,v 1.86 2015/12/06 17:50:21 deraadt Exp $ */ /* $NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $ */ /* @@ -400,7 +400,7 @@ ktrexec(struct proc *p, int type, const char *data, ssize_t len) } void -ktrpledge(struct proc *p, int error, int code, int syscall) +ktrpledge(struct proc *p, int error, uint64_t code, int syscall) { struct ktr_header kth; struct ktr_pledge kp; diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index 75591b8583c..396d2cb64f6 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.135 2015/12/05 19:21:49 deraadt Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.136 2015/12/06 17:50:21 deraadt Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -72,7 +72,7 @@ int substrcmp(const char *p1, size_t s1, const char *p2, size_t s2); /* * Ordered in blocks starting with least risky and most required. */ -const u_int pledge_syscalls[SYS_MAXSYSCALL] = { +const uint64_t pledge_syscalls[SYS_MAXSYSCALL] = { /* * Minimum required */ @@ -368,7 +368,7 @@ sys_pledge(struct proc *p, void *v, register_t *retval) syscallarg(const char *)request; syscallarg(const char **)paths; } */ *uap = v; - int flags = 0; + uint64_t flags = 0; int error; if (SCARG(uap, request)) { @@ -563,7 +563,7 @@ pledge_syscall(struct proc *p, int code, int *tval) } int -pledge_fail(struct proc *p, int error, int code) +pledge_fail(struct proc *p, int error, uint64_t code) { char *codes = ""; int i; |