/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
* limitations under the License.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
-/*
+ *
+ *
+ * Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved
+ *
+ *
* Copyright (c) 1982, 1986, 1989, 1990, 1991, 1993
* The Regents of the University of California. All rights reserved.
* (c) UNIX System Laboratories, Inc.
* SUCH DAMAGE.
*
* @(#)kern_prot.c 8.9 (Berkeley) 2/14/95
- */
-/*
+ *
+ *
* NOTICE: This file was modified by McAfee Research in 2004 to introduce
* support for mandatory and extensible security protections. This notice
* is included in support of clause 2.2 (b) of the Apple Public License,
* Version 2.0.
- */
-/*
+ *
+ *
* NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
* support for mandatory and extensible security protections. This notice
* is included in support of clause 2.2 (b) of the Apple Public License,
* Version 2.0.
+ *
*/
/*
#include <sys/times.h>
#include <sys/malloc.h>
-#include <bsm/audit_kernel.h>
+#include <security/audit/audit.h>
#if CONFIG_LCTX
#include <sys/lctx.h>
#include <kern/assert.h>
-int groupmember(gid_t gid, kauth_cred_t cred);
-
/*
* Credential debugging; we can track entry into a function that might
* change a credential, and we can track actual credential changes that
* XXX: Belongs in kern_proc.c
*/
int
-setprivexec(proc_t p, struct setprivexec_args *uap, register_t *retval)
+setprivexec(proc_t p, struct setprivexec_args *uap, int32_t *retval)
{
- AUDIT_ARG(value, uap->flag);
+ AUDIT_ARG(value32, uap->flag);
*retval = p->p_debugger;
p->p_debugger = (uap->flag != 0);
return(0);
* XXX: Belongs in kern_proc.c
*/
int
-getpid(proc_t p, __unused struct getpid_args *uap, register_t *retval)
+getpid(proc_t p, __unused struct getpid_args *uap, int32_t *retval)
{
*retval = p->p_pid;
* XXX: Belongs in kern_proc.c
*/
int
-getppid(proc_t p, __unused struct getppid_args *uap, register_t *retval)
+getppid(proc_t p, __unused struct getppid_args *uap, int32_t *retval)
{
*retval = p->p_ppid;
* XXX: Belongs in kern_proc.c
*/
int
-getpgrp(proc_t p, __unused struct getpgrp_args *uap, register_t *retval)
+getpgrp(proc_t p, __unused struct getpgrp_args *uap, int32_t *retval)
{
*retval = p->p_pgrpid;
* XXX: Belongs in kern_proc.c
*/
int
-getpgid(proc_t p, struct getpgid_args *uap, register_t *retval)
+getpgid(proc_t p, struct getpgid_args *uap, int32_t *retval)
{
proc_t pt;
int refheld = 0;
* XXX: Belongs in kern_proc.c
*/
int
-getsid(proc_t p, struct getsid_args *uap, register_t *retval)
+getsid(proc_t p, struct getsid_args *uap, int32_t *retval)
{
proc_t pt;
int refheld = 0;
* Returns: uid_t The real uid of the caller
*/
int
-getuid(__unused proc_t p, __unused struct getuid_args *uap, register_t *retval)
+getuid(__unused proc_t p, __unused struct getuid_args *uap, int32_t *retval)
{
*retval = kauth_getruid();
* Returns: uid_t The effective uid of the caller
*/
int
-geteuid(__unused proc_t p, __unused struct geteuid_args *uap, register_t *retval)
+geteuid(__unused proc_t p, __unused struct geteuid_args *uap, int32_t *retval)
{
*retval = kauth_getuid();
* ESRCH No per thread identity active
*/
int
-gettid(__unused proc_t p, struct gettid_args *uap, register_t *retval)
+gettid(__unused proc_t p, struct gettid_args *uap, int32_t *retval)
{
struct uthread *uthread = get_bsdthread_info(current_thread());
int error;
* Returns: gid_t The real gid of the caller
*/
int
-getgid(__unused proc_t p, __unused struct getgid_args *uap, register_t *retval)
+getgid(__unused proc_t p, __unused struct getgid_args *uap, int32_t *retval)
{
*retval = kauth_getrgid();
* detail.
*/
int
-getegid(__unused proc_t p, __unused struct getegid_args *uap, register_t *retval)
+getegid(__unused proc_t p, __unused struct getegid_args *uap, int32_t *retval)
{
*retval = kauth_getgid();
* be returned by this call.
*/
int
-getgroups(__unused proc_t p, struct getgroups_args *uap, register_t *retval)
+getgroups(__unused proc_t p, struct getgroups_args *uap, int32_t *retval)
{
int ngrp;
int error;
/*
* Return the per-thread/per-process supplementary groups list.
+ *
+ * XXX implement getsgroups
+ *
*/
-#warning XXX implement getsgroups
+
int
-getsgroups(__unused proc_t p, __unused struct getsgroups_args *uap, __unused register_t *retval)
+getsgroups(__unused proc_t p, __unused struct getsgroups_args *uap, __unused int32_t *retval)
{
- /* XXX implement */
return(ENOTSUP);
}
/*
* Return the per-thread/per-process whiteout groups list.
+ *
+ * XXX implement getwgroups
+ *
*/
-#warning XXX implement getwgroups
+
int
-getwgroups(__unused proc_t p, __unused struct getwgroups_args *uap, __unused register_t *retval)
+getwgroups(__unused proc_t p, __unused struct getwgroups_args *uap, __unused int32_t *retval)
{
- /* XXX implement */
return(ENOTSUP);
}
* XXX: Belongs in kern_proc.c
*/
int
-setsid(proc_t p, __unused struct setsid_args *uap, register_t *retval)
+setsid(proc_t p, __unused struct setsid_args *uap, int32_t *retval)
{
struct pgrp * pg = PGRP_NULL;
* XXX: Belongs in kern_proc.c
*/
int
-setpgid(proc_t curp, register struct setpgid_args *uap, __unused register_t *retval)
+setpgid(proc_t curp, register struct setpgid_args *uap, __unused int32_t *retval)
{
proc_t targp = PROC_NULL; /* target process */
struct pgrp *pg = PGRP_NULL; /* target pgrp */
* execution.
*/
int
-issetugid(proc_t p, __unused struct issetugid_args *uap, register_t *retval)
+issetugid(proc_t p, __unused struct issetugid_args *uap, int32_t *retval)
{
/*
* Note: OpenBSD sets a P_SUGIDEXEC flag set at execve() time,
* flag the process as having set privilege since the last exec.
*/
int
-setuid(proc_t p, struct setuid_args *uap, __unused register_t *retval)
+setuid(proc_t p, struct setuid_args *uap, __unused int32_t *retval)
{
uid_t uid;
uid_t svuid = KAUTH_UID_NONE;
my_cred = kauth_cred_proc_ref(p);
DEBUG_CRED_ENTER("setuid (%d/%d): %p %d\n", p->p_pid, (p->p_pptr ? p->p_pptr->p_pid : 0), my_cred, uap->uid);
- AUDIT_ARG(uid, uid, 0, 0, 0);
+ AUDIT_ARG(uid, uid);
if (uid != my_cred->cr_ruid && /* allow setuid(getuid()) */
uid != my_cred->cr_svuid && /* allow setuid(saved uid) */
* chgproccnt uses list lock for protection
*/
(void)chgproccnt(uid, 1);
- (void)chgproccnt(kauth_getruid(), -1);
+ (void)chgproccnt(my_cred->cr_ruid, -1);
}
/* get current credential and take a reference while we muck with it */
continue;
}
p->p_ucred = my_new_cred;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
proc_unlock(p);
}
break;
* flag the process as having set privilege since the last exec.
*/
int
-seteuid(proc_t p, struct seteuid_args *uap, __unused register_t *retval)
+seteuid(proc_t p, struct seteuid_args *uap, __unused int32_t *retval)
{
uid_t euid;
int error;
DEBUG_CRED_ENTER("seteuid: %d\n", uap->euid);
euid = uap->euid;
- AUDIT_ARG(uid, 0, euid, 0, 0);
+ AUDIT_ARG(euid, euid);
my_cred = kauth_cred_proc_ref(p);
continue;
}
p->p_ucred = my_new_cred;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
proc_unlock(p);
}
break;
* flag the process as having set privilege since the last exec.
*/
int
-setreuid(proc_t p, struct setreuid_args *uap, __unused register_t *retval)
+setreuid(proc_t p, struct setreuid_args *uap, __unused int32_t *retval)
{
uid_t ruid, euid;
int error;
ruid = KAUTH_UID_NONE;
if (euid == (uid_t)-1)
euid = KAUTH_UID_NONE;
- AUDIT_ARG(uid, euid, ruid, 0, 0);
+ AUDIT_ARG(euid, euid);
+ AUDIT_ARG(ruid, ruid);
my_cred = kauth_cred_proc_ref(p);
if (euid == KAUTH_UID_NONE && my_cred->cr_uid != euid) {
/* changing the effective UID */
new_euid = euid;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
}
if (ruid != KAUTH_UID_NONE && my_cred->cr_ruid != ruid) {
/* changing the real UID; must do user accounting */
(void)chgproccnt(ruid, 1);
(void)chgproccnt(my_cred->cr_ruid, -1);
new_ruid = ruid;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
}
/*
* If the newly requested real uid or effective uid does
if (my_cred->cr_svuid != uap->ruid &&
my_cred->cr_svuid != uap->euid) {
svuid = new_euid;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
}
my_new_cred = kauth_cred_setresuid(my_cred, ruid, euid, svuid, my_cred->cr_gmuid);
continue;
}
p->p_ucred = my_new_cred;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag); /* XXX redundant? */
+ OSBitOrAtomic(P_SUGID, &p->p_flag); /* XXX redundant? */
proc_unlock(p);
}
break;
* the supplementary group list unchanged.
*/
int
-setgid(proc_t p, struct setgid_args *uap, __unused register_t *retval)
+setgid(proc_t p, struct setgid_args *uap, __unused int32_t *retval)
{
gid_t gid;
gid_t rgid = KAUTH_GID_NONE;
DEBUG_CRED_ENTER("setgid(%d/%d): %d\n", p->p_pid, (p->p_pptr ? p->p_pptr->p_pid : 0), uap->gid);
gid = uap->gid;
- AUDIT_ARG(gid, gid, 0, 0, 0);
+ AUDIT_ARG(gid, gid);
my_cred = kauth_cred_proc_ref(p);
continue;
}
p->p_ucred = my_new_cred;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
proc_unlock(p);
}
break;
* the supplementary group list unchanged.
*/
int
-setegid(proc_t p, struct setegid_args *uap, __unused register_t *retval)
+setegid(proc_t p, struct setegid_args *uap, __unused int32_t *retval)
{
gid_t egid;
int error;
DEBUG_CRED_ENTER("setegid %d\n", uap->egid);
egid = uap->egid;
- AUDIT_ARG(gid, 0, egid, 0, 0);
+ AUDIT_ARG(egid, egid);
my_cred = kauth_cred_proc_ref(p);
continue;
}
p->p_ucred = my_new_cred;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
proc_unlock(p);
}
break;
* the supplementary group list unchanged.
*/
int
-setregid(proc_t p, struct setregid_args *uap, __unused register_t *retval)
+setregid(proc_t p, struct setregid_args *uap, __unused int32_t *retval)
{
gid_t rgid, egid;
int error;
rgid = KAUTH_GID_NONE;
if (egid == (uid_t)-1)
egid = KAUTH_GID_NONE;
- AUDIT_ARG(gid, egid, rgid, 0, 0);
+ AUDIT_ARG(egid, egid);
+ AUDIT_ARG(rgid, rgid);
my_cred = kauth_cred_proc_ref(p);
if (egid == KAUTH_UID_NONE && my_cred->cr_groups[0] != egid) {
/* changing the effective GID */
new_egid = egid;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
}
if (rgid != KAUTH_UID_NONE && my_cred->cr_rgid != rgid) {
/* changing the real GID */
new_rgid = rgid;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
}
/*
* If the newly requested real gid or effective gid does
if (my_cred->cr_svgid != uap->rgid &&
my_cred->cr_svgid != uap->egid) {
svgid = new_egid;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
}
my_new_cred = kauth_cred_setresgid(my_cred, rgid, egid, svgid);
continue;
}
p->p_ucred = my_new_cred;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag); /* XXX redundant? */
+ OSBitOrAtomic(P_SUGID, &p->p_flag); /* XXX redundant? */
proc_unlock(p);
}
break;
* thread to the requested UID and single GID, and clears all other GIDs.
*/
int
-settid(proc_t p, struct settid_args *uap, __unused register_t *retval)
+settid(proc_t p, struct settid_args *uap, __unused int32_t *retval)
{
kauth_cred_t uc;
struct uthread *uthread = get_bsdthread_info(current_thread());
uid = uap->uid;
gid = uap->gid;
- AUDIT_ARG(uid, uid, gid, gid, 0);
+ AUDIT_ARG(uid, uid);
+ AUDIT_ARG(gid, gid);
if (proc_suser(p) != 0)
return (EPERM);
* When the assume argument is zero we revert back to our normal identity.
*/
int
-settid_with_pid(proc_t p, struct settid_with_pid_args *uap, __unused register_t *retval)
+settid_with_pid(proc_t p, struct settid_with_pid_args *uap, __unused int32_t *retval)
{
proc_t target_proc;
struct uthread *uthread = get_bsdthread_info(current_thread());
kauth_cred_t my_cred, my_target_cred, my_new_cred;
AUDIT_ARG(pid, uap->pid);
- AUDIT_ARG(value, uap->assume);
+ AUDIT_ARG(value32, uap->assume);
if (proc_suser(p) != 0) {
return (EPERM);
* flag the process as having set privilege since the last exec.
*/
static int
-setgroups1(proc_t p, u_int gidsetsize, user_addr_t gidset, uid_t gmuid, __unused register_t *retval)
+setgroups1(proc_t p, u_int gidsetsize, user_addr_t gidset, uid_t gmuid, __unused int32_t *retval)
{
u_int ngrp;
gid_t newgroups[NGROUPS] = { 0 };
continue;
}
p->p_ucred = my_new_cred;
- OSBitOrAtomic(P_SUGID, (UInt32 *)&p->p_flag);
+ OSBitOrAtomic(P_SUGID, &p->p_flag);
proc_unlock(p);
}
break;
* See also: setgroups1()
*/
int
-initgroups(proc_t p, struct initgroups_args *uap, __unused register_t *retval)
+initgroups(proc_t p, struct initgroups_args *uap, __unused int32_t *retval)
{
DEBUG_CRED_ENTER("initgroups\n");
* See also: setgroups1()
*/
int
-setgroups(proc_t p, struct setgroups_args *uap, __unused register_t *retval)
+setgroups(proc_t p, struct setgroups_args *uap, __unused int32_t *retval)
{
DEBUG_CRED_ENTER("setgroups\n");
/*
* Set the per-thread/per-process supplementary groups list.
+ *
+ * XXX implement setsgroups
+ *
*/
-#warning XXX implement setsgroups
+
int
-setsgroups(__unused proc_t p, __unused struct setsgroups_args *uap, __unused register_t *retval)
+setsgroups(__unused proc_t p, __unused struct setsgroups_args *uap, __unused int32_t *retval)
{
return(ENOTSUP);
}
/*
* Set the per-thread/per-process whiteout groups list.
+ *
+ * XXX implement setwgroups
+ *
*/
-#warning XXX implement setwgroups
+
int
-setwgroups(__unused proc_t p, __unused struct setwgroups_args *uap, __unused register_t *retval)
+setwgroups(__unused proc_t p, __unused struct setwgroups_args *uap, __unused int32_t *retval)
{
return(ENOTSUP);
}
* XXX: Belongs in kern_proc.c
*/
int
-getlogin(proc_t p, struct getlogin_args *uap, __unused register_t *retval)
+getlogin(proc_t p, struct getlogin_args *uap, __unused int32_t *retval)
{
char buffer[MAXLOGNAME+1];
struct session * sessp;
* XXX: Belongs in kern_proc.c
*/
int
-setlogin(proc_t p, struct setlogin_args *uap, __unused register_t *retval)
+setlogin(proc_t p, struct setlogin_args *uap, __unused int32_t *retval)
{
int error;
- int dummy=0;
+ size_t dummy=0;
char buffer[MAXLOGNAME+1];
struct session * sessp;
* the user of the trailer from future representation
* changes.
*/
- audit_token.val[0] = my_cred->cr_au.ai_auid;
+ audit_token.val[0] = my_cred->cr_audit.as_aia_p->ai_auid;
audit_token.val[1] = my_cred->cr_uid;
audit_token.val[2] = my_cred->cr_gid;
audit_token.val[3] = my_cred->cr_ruid;
audit_token.val[4] = my_cred->cr_rgid;
audit_token.val[5] = p->p_pid;
- audit_token.val[6] = my_cred->cr_au.ai_asid;
- audit_token.val[7] = my_cred->cr_au.ai_termid.port;
+ audit_token.val[6] = my_cred->cr_audit.as_aia_p->ai_asid;
+ audit_token.val[7] = p->p_idversion;
#if CONFIG_MACF_MACH
mac_task_label_update_cred(my_cred, p->task);
* LCTX by its own locks.
*/
int
-setlcid(proc_t p0, struct setlcid_args *uap, __unused register_t *retval)
+setlcid(proc_t p0, struct setlcid_args *uap, __unused int32_t *retval)
{
proc_t p;
struct lctx *l;
int refheld = 0;
AUDIT_ARG(pid, uap->pid);
- AUDIT_ARG(value, uap->lcid);
+ AUDIT_ARG(value32, uap->lcid);
if (uap->pid == LCID_PROC_SELF) { /* Create/Join/Leave */
p = p0;
} else { /* Adopt/Orphan */
* protected by the all-context lock.
*/
int
-getlcid(proc_t p0, struct getlcid_args *uap, register_t *retval)
+getlcid(proc_t p0, struct getlcid_args *uap, int32_t *retval)
{
proc_t p;
int error = 0;
}
#else /* LCTX */
int
-setlcid(proc_t p0, struct setlcid_args *uap, register_t *retval)
+setlcid(proc_t p0, struct setlcid_args *uap, int32_t *retval)
{
return (ENOSYS);
}
int
-getlcid(proc_t p0, struct getlcid_args *uap, register_t *retval)
+getlcid(proc_t p0, struct getlcid_args *uap, int32_t *retval)
{
return (ENOSYS);
projects / apple / xnu.git / blobdiff