summaryrefslogtreecommitdiffstats
path: root/sys/security/mac_stub
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2009-03-08 10:58:37 +0000
committerrwatson <rwatson@FreeBSD.org>2009-03-08 10:58:37 +0000
commit5e4df0321040298824b89122715cfbc3a7e80b53 (patch)
treea0deefddb5b2eee47d0f494093e5ca46d01ed788 /sys/security/mac_stub
parent30842195f478f6d07840316d4339ce323129d633 (diff)
downloadFreeBSD-src-5e4df0321040298824b89122715cfbc3a7e80b53.zip
FreeBSD-src-5e4df0321040298824b89122715cfbc3a7e80b53.tar.gz
Improve the consistency of MAC Framework and MAC policy entry point
naming by renaming certain "proc" entry points to "cred" entry points, reflecting their manipulation of credentials. For some entry points, the process was passed into the framework but not into policies; in these cases, stop passing in the process since we don't need it. mac_proc_check_setaudit -> mac_cred_check_setaudit mac_proc_check_setaudit_addr -> mac_cred_check_setaudit_addr mac_proc_check_setauid -> mac_cred_check_setauid mac_proc_check_setegid -> mac_cred_check_setegid mac_proc_check_seteuid -> mac_cred_check_seteuid mac_proc_check_setgid -> mac_cred_check_setgid mac_proc_check_setgroups -> mac_cred_ceck_setgroups mac_proc_check_setregid -> mac_cred_check_setregid mac_proc_check_setresgid -> mac_cred_check_setresgid mac_proc_check_setresuid -> mac_cred_check_setresuid mac_proc_check_setreuid -> mac_cred_check_setreuid mac_proc_check_setuid -> mac_cred_check_setuid Obtained from: TrustedBSD Project Sponsored by: Google, Inc.
Diffstat (limited to 'sys/security/mac_stub')
-rw-r--r--sys/security/mac_stub/mac_stub.c203
1 files changed, 103 insertions, 100 deletions
diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c
index 23228a7..169198a 100644
--- a/sys/security/mac_stub/mac_stub.c
+++ b/sys/security/mac_stub/mac_stub.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1999-2002, 2007-2008 Robert N. M. Watson
+ * Copyright (c) 1999-2002, 2007-2009 Robert N. M. Watson
* Copyright (c) 2001-2005 McAfee, Inc.
* Copyright (c) 2005-2006 SPARTA, Inc.
* Copyright (c) 2008 Apple Inc.
@@ -15,6 +15,9 @@
* This software was enhanced by SPARTA ISSO under SPAWAR contract
* N66001-04-C-6019 ("SEFOS").
*
+ * This software was developed at the University of Cambridge Computer
+ * Laboratory with support from a grant from Google, Inc.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -199,6 +202,93 @@ stub_cred_check_relabel(struct ucred *cred, struct label *newlabel)
}
static int
+stub_cred_check_setaudit(struct ucred *cred, struct auditinfo *ai)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_setaudit_addr(struct ucred *cred, struct auditinfo_addr *aia)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_setauid(struct ucred *cred, uid_t auid)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_setegid(struct ucred *cred, gid_t egid)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_seteuid(struct ucred *cred, uid_t euid)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_setgid(struct ucred *cred, gid_t gid)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_setgroups(struct ucred *cred, int ngroups,
+ gid_t *gidset)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_setregid(struct ucred *cred, gid_t rgid, gid_t egid)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_setresgid(struct ucred *cred, gid_t rgid, gid_t egid,
+ gid_t sgid)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_setresuid(struct ucred *cred, uid_t ruid, uid_t euid,
+ uid_t suid)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_setreuid(struct ucred *cred, uid_t ruid, uid_t euid)
+{
+
+ return (0);
+}
+
+static int
+stub_cred_check_setuid(struct ucred *cred, uid_t uid)
+{
+
+ return (0);
+}
+
+static int
stub_cred_check_visible(struct ucred *cr1, struct ucred *cr2)
{
@@ -701,93 +791,6 @@ stub_proc_check_sched(struct ucred *cred, struct proc *p)
}
static int
-stub_proc_check_setaudit(struct ucred *cred, struct auditinfo *ai)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_setaudit_addr(struct ucred *cred, struct auditinfo_addr *aia)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_setauid(struct ucred *cred, uid_t auid)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_setegid(struct ucred *cred, gid_t egid)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_seteuid(struct ucred *cred, uid_t euid)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_setgid(struct ucred *cred, gid_t gid)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_setgroups(struct ucred *cred, int ngroups,
- gid_t *gidset)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_setregid(struct ucred *cred, gid_t rgid, gid_t egid)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_setresgid(struct ucred *cred, gid_t rgid, gid_t egid,
- gid_t sgid)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_setresuid(struct ucred *cred, uid_t ruid, uid_t euid,
- uid_t suid)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_setreuid(struct ucred *cred, uid_t ruid, uid_t euid)
-{
-
- return (0);
-}
-
-static int
-stub_proc_check_setuid(struct ucred *cred, uid_t uid)
-{
-
- return (0);
-}
-
-static int
stub_proc_check_signal(struct ucred *cred, struct proc *p, int signum)
{
@@ -1541,6 +1544,18 @@ static struct mac_policy_ops stub_ops =
.mpo_cred_associate_nfsd = stub_cred_associate_nfsd,
.mpo_cred_check_relabel = stub_cred_check_relabel,
+ .mpo_cred_check_setaudit = stub_cred_check_setaudit,
+ .mpo_cred_check_setaudit_addr = stub_cred_check_setaudit_addr,
+ .mpo_cred_check_setauid = stub_cred_check_setauid,
+ .mpo_cred_check_setegid = stub_cred_check_setegid,
+ .mpo_cred_check_seteuid = stub_cred_check_seteuid,
+ .mpo_cred_check_setgid = stub_cred_check_setgid,
+ .mpo_cred_check_setgroups = stub_cred_check_setgroups,
+ .mpo_cred_check_setregid = stub_cred_check_setregid,
+ .mpo_cred_check_setresgid = stub_cred_check_setresgid,
+ .mpo_cred_check_setresuid = stub_cred_check_setresuid,
+ .mpo_cred_check_setreuid = stub_cred_check_setreuid,
+ .mpo_cred_check_setuid = stub_cred_check_setuid,
.mpo_cred_check_visible = stub_cred_check_visible,
.mpo_cred_copy_label = stub_copy_label,
.mpo_cred_create_init = stub_cred_create_init,
@@ -1660,18 +1675,6 @@ static struct mac_policy_ops stub_ops =
.mpo_proc_check_debug = stub_proc_check_debug,
.mpo_proc_check_sched = stub_proc_check_sched,
- .mpo_proc_check_setaudit = stub_proc_check_setaudit,
- .mpo_proc_check_setaudit_addr = stub_proc_check_setaudit_addr,
- .mpo_proc_check_setauid = stub_proc_check_setauid,
- .mpo_proc_check_setegid = stub_proc_check_setegid,
- .mpo_proc_check_seteuid = stub_proc_check_seteuid,
- .mpo_proc_check_setgid = stub_proc_check_setgid,
- .mpo_proc_check_setgroups = stub_proc_check_setgroups,
- .mpo_proc_check_setregid = stub_proc_check_setregid,
- .mpo_proc_check_setresgid = stub_proc_check_setresgid,
- .mpo_proc_check_setresuid = stub_proc_check_setresuid,
- .mpo_proc_check_setreuid = stub_proc_check_setreuid,
- .mpo_proc_check_setuid = stub_proc_check_setuid,
.mpo_proc_check_signal = stub_proc_check_signal,
.mpo_proc_check_wait = stub_proc_check_wait,
OpenPOWER on IntegriCloud