Date: Sat, 6 Dec 2003 15:29:45 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 43512 for review Message-ID: <200312062329.hB6NTjOA076042@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=43512 Change 43512 by peter@peter_overcee on 2003/12/06 15:29:30 IFC @43511 Affected files ... .. //depot/projects/hammer/sys/amd64/acpica/madt.c#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#8 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/critical.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#6 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#27 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#75 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/nexus.c#20 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#49 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#16 integrate .. //depot/projects/hammer/sys/amd64/include/critical.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/mutex.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/runq.h#8 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_bus.c#12 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#11 integrate .. //depot/projects/hammer/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#21 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#15 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#21 integrate .. //depot/projects/hammer/sys/security/mac_partition/mac_partition.c#6 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#5 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#18 integrate .. //depot/projects/hammer/sys/sys/mac.h#16 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#15 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/acpica/madt.c#24 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.8 2003/12/03 06:58:48 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.9 2003/12/06 23:14:44 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/amd64/amd64/amd64-gdbstub.c#8 (text+ko) ==== @@ -13,7 +13,7 @@ ****************************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.25 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64-gdbstub.c,v 1.26 2003/12/06 23:19:46 peter Exp $"); /**************************************************************************** * Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $ ==== //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.23 2003/11/22 01:11:07 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.24 2003/12/06 23:19:46 peter Exp $"); #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#13 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.95 2003/11/17 08:58:12 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.96 2003/12/06 23:19:47 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/critical.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.12 2003/08/12 23:24:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/critical.c,v 1.13 2003/12/06 23:13:22 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.146 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.147 2003/12/06 23:19:47 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#27 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.4 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.5 2003/12/06 23:14:44 peter Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#75 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.600 2003/11/20 22:54:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.601 2003/12/06 23:19:47 peter Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" ==== //depot/projects/hammer/sys/amd64/amd64/mem.c#14 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.111 2003/11/17 08:58:12 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.112 2003/12/06 23:19:47 peter Exp $"); /* * Memory special file ==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#20 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.57 2003/11/21 03:00:05 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.58 2003/12/06 23:19:47 peter Exp $"); /* * This code implements a `root nexus' for Intel Architecture ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#49 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.447 2003/11/21 03:01:59 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.448 2003/12/06 23:18:42 peter Exp $"); /* * Manages physical address maps. ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#16 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.137 2003/11/08 04:39:22 peter Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.138 2003/12/06 23:22:43 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/include/critical.h#11 (text+ko) ==== @@ -33,7 +33,7 @@ * related support functions residing * in <arch>/<arch>/critical.c - prototyped * - * $FreeBSD: src/sys/amd64/include/critical.h,v 1.5 2003/08/12 23:24:04 imp Exp $ + * $FreeBSD: src/sys/amd64/include/critical.h,v 1.6 2003/12/06 23:13:22 peter Exp $ */ #ifndef _MACHINE_CRITICAL_H_ ==== //depot/projects/hammer/sys/amd64/include/mutex.h#7 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.37 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/mutex.h,v 1.38 2003/12/06 23:17:18 peter Exp $ */ #ifndef _MACHINE_MUTEX_H_ ==== //depot/projects/hammer/sys/amd64/include/runq.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ + * $FreeBSD: src/sys/amd64/include/runq.h,v 1.3 2003/12/06 23:24:18 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ ==== //depot/projects/hammer/sys/amd64/pci/pci_bus.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.105 2003/11/17 08:58:15 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.106 2003/12/06 23:19:47 peter Exp $"); #include "opt_cpu.h" ==== //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.103 2003/07/25 21:19:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.104 2003/12/06 23:19:47 peter Exp $"); #include <sys/param.h> /* XXX trim includes */ #include <sys/systm.h> ==== //depot/projects/hammer/sys/kern/kern_prot.c#11 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.178 2003/11/17 20:20:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_prot.c,v 1.179 2003/12/06 21:48:01 rwatson Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1804,7 +1804,7 @@ if (jailed(dest)) prison_hold(dest->cr_prison); #ifdef MAC - mac_create_cred(src, dest); + mac_copy_cred(src, dest); #endif } ==== //depot/projects/hammer/sys/security/mac/mac_process.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.104 2003/11/12 03:14:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/security/mac/mac_process.c,v 1.105 2003/12/06 21:48:01 rwatson Exp $"); #include "opt_mac.h" @@ -222,10 +222,10 @@ * deltas. This function allows that processing to take place. */ void -mac_create_cred(struct ucred *parent_cred, struct ucred *child_cred) +mac_copy_cred(struct ucred *src, struct ucred *dest) { - MAC_PERFORM(create_cred, parent_cred, child_cred); + MAC_PERFORM(copy_cred_label, src->cr_label, dest->cr_label); } int ==== //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.71 2003/11/18 04:11:52 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.72 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -1328,18 +1328,6 @@ * Labeling event operations: processes. */ static void -mac_biba_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - struct mac_biba *source, *dest; - - source = SLOT(cred_parent->cr_label); - dest = SLOT(cred_child->cr_label); - - mac_biba_copy_single(source, dest); - mac_biba_copy_range(source, dest); -} - -static void mac_biba_create_proc0(struct ucred *cred) { struct mac_biba *dest; @@ -2668,6 +2656,7 @@ .mpo_destroy_socket_label = mac_biba_destroy_label, .mpo_destroy_socket_peer_label = mac_biba_destroy_label, .mpo_destroy_vnode_label = mac_biba_destroy_label, + .mpo_copy_cred_label = mac_biba_copy_label, .mpo_copy_mbuf_label = mac_biba_copy_label, .mpo_copy_pipe_label = mac_biba_copy_label, .mpo_copy_socket_label = mac_biba_copy_label, @@ -2719,7 +2708,6 @@ .mpo_relabel_ifnet = mac_biba_relabel_ifnet, .mpo_update_ipq = mac_biba_update_ipq, .mpo_inpcb_sosetlabel = mac_biba_inpcb_sosetlabel, - .mpo_create_cred = mac_biba_create_cred, .mpo_create_proc0 = mac_biba_create_proc0, .mpo_create_proc1 = mac_biba_create_proc1, .mpo_relabel_cred = mac_biba_relabel_cred, ==== //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.24 2003/11/18 00:39:06 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_lomac/mac_lomac.c,v 1.25 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -1468,18 +1468,6 @@ * Labeling event operations: processes. */ static void -mac_lomac_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - struct mac_lomac *source, *dest; - - source = SLOT(cred_parent->cr_label); - dest = SLOT(cred_child->cr_label); - - mac_lomac_copy_single(source, dest); - mac_lomac_copy_range(source, dest); -} - -static void mac_lomac_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, struct image_params *imgp, @@ -2648,6 +2636,7 @@ .mpo_destroy_socket_label = mac_lomac_destroy_label, .mpo_destroy_socket_peer_label = mac_lomac_destroy_label, .mpo_destroy_vnode_label = mac_lomac_destroy_label, + .mpo_copy_cred_label = mac_lomac_copy_label, .mpo_copy_mbuf_label = mac_lomac_copy_label, .mpo_copy_pipe_label = mac_lomac_copy_label, .mpo_copy_socket_label = mac_lomac_copy_label, @@ -2702,7 +2691,6 @@ .mpo_relabel_ifnet = mac_lomac_relabel_ifnet, .mpo_update_ipq = mac_lomac_update_ipq, .mpo_inpcb_sosetlabel = mac_lomac_inpcb_sosetlabel, - .mpo_create_cred = mac_lomac_create_cred, .mpo_execve_transition = mac_lomac_execve_transition, .mpo_execve_will_transition = mac_lomac_execve_will_transition, .mpo_create_proc0 = mac_lomac_create_proc0, ==== //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.58 2003/11/18 04:11:52 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.59 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -1258,18 +1258,6 @@ * Labeling event operations: processes. */ static void -mac_mls_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - struct mac_mls *source, *dest; - - source = SLOT(cred_parent->cr_label); - dest = SLOT(cred_child->cr_label); - - mac_mls_copy_single(source, dest); - mac_mls_copy_range(source, dest); -} - -static void mac_mls_create_proc0(struct ucred *cred) { struct mac_mls *dest; @@ -2440,6 +2428,7 @@ .mpo_destroy_socket_label = mac_mls_destroy_label, .mpo_destroy_socket_peer_label = mac_mls_destroy_label, .mpo_destroy_vnode_label = mac_mls_destroy_label, + .mpo_copy_cred_label = mac_mls_copy_label, .mpo_copy_mbuf_label = mac_mls_copy_label, .mpo_copy_pipe_label = mac_mls_copy_label, .mpo_copy_socket_label = mac_mls_copy_label, @@ -2491,7 +2480,6 @@ .mpo_relabel_ifnet = mac_mls_relabel_ifnet, .mpo_update_ipq = mac_mls_update_ipq, .mpo_inpcb_sosetlabel = mac_mls_inpcb_sosetlabel, - .mpo_create_cred = mac_mls_create_cred, .mpo_create_proc0 = mac_mls_create_proc0, .mpo_create_proc1 = mac_mls_create_proc1, .mpo_relabel_cred = mac_mls_relabel_cred, ==== //depot/projects/hammer/sys/security/mac_partition/mac_partition.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_partition/mac_partition.c,v 1.8 2003/11/12 03:14:31 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_partition/mac_partition.c,v 1.9 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -101,6 +101,13 @@ SLOT(label) = 0; } +static void +mac_partition_copy_label(struct label *src, struct label *dest) +{ + + SLOT(dest) = SLOT(src); +} + static int mac_partition_externalize_label(struct label *label, char *element_name, struct sbuf *sb, int *claimed) @@ -131,13 +138,6 @@ } static void -mac_partition_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - - SLOT(cred_child->cr_label) = SLOT(cred_parent->cr_label); -} - -static void mac_partition_create_proc0(struct ucred *cred) { @@ -271,9 +271,9 @@ .mpo_init = mac_partition_init, .mpo_init_cred_label = mac_partition_init_label, .mpo_destroy_cred_label = mac_partition_destroy_label, + .mpo_copy_cred_label = mac_partition_copy_label, .mpo_externalize_cred_label = mac_partition_externalize_label, .mpo_internalize_cred_label = mac_partition_internalize_label, - .mpo_create_cred = mac_partition_create_cred, .mpo_create_proc0 = mac_partition_create_proc0, .mpo_create_proc1 = mac_partition_create_proc1, .mpo_relabel_cred = mac_partition_relabel_cred, ==== //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_stub/mac_stub.c,v 1.35 2003/11/18 00:39:07 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_stub/mac_stub.c,v 1.36 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -439,12 +439,6 @@ * Labeling event operations: processes. */ static void -stub_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - -} - -static void stub_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel, struct image_params *imgp, @@ -1055,6 +1049,7 @@ .mpo_destroy_socket_label = stub_destroy_label, .mpo_destroy_socket_peer_label = stub_destroy_label, .mpo_destroy_vnode_label = stub_destroy_label, + .mpo_copy_cred_label = stub_copy_label, .mpo_copy_mbuf_label = stub_copy_label, .mpo_copy_pipe_label = stub_copy_label, .mpo_copy_socket_label = stub_copy_label, @@ -1109,7 +1104,6 @@ .mpo_relabel_ifnet = stub_relabel_ifnet, .mpo_update_ipq = stub_update_ipq, .mpo_inpcb_sosetlabel = stub_inpcb_sosetlabel, - .mpo_create_cred = stub_create_cred, .mpo_execve_transition = stub_execve_transition, .mpo_execve_will_transition = stub_execve_will_transition, .mpo_create_proc0 = stub_create_proc0, ==== //depot/projects/hammer/sys/security/mac_test/mac_test.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.37 2003/11/18 00:39:07 rwatson Exp $ + * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.38 2003/12/06 21:48:02 rwatson Exp $ */ /* @@ -591,6 +591,14 @@ } static void +mac_test_copy_cred_label(struct label *src, struct label *dest) +{ + + ASSERT_CRED_LABEL(src); + ASSERT_CRED_LABEL(dest); +} + +static void mac_test_copy_mbuf_label(struct label *src, struct label *dest) { @@ -1021,14 +1029,6 @@ * Labeling event operations: processes. */ static void -mac_test_create_cred(struct ucred *cred_parent, struct ucred *cred_child) -{ - - ASSERT_CRED_LABEL(cred_parent->cr_label); - ASSERT_CRED_LABEL(cred_child->cr_label); -} - -static void mac_test_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *filelabel, struct label *interpvnodelabel, struct image_params *imgp, @@ -1879,6 +1879,7 @@ .mpo_destroy_socket_label = mac_test_destroy_socket_label, .mpo_destroy_socket_peer_label = mac_test_destroy_socket_peer_label, .mpo_destroy_vnode_label = mac_test_destroy_vnode_label, + .mpo_copy_cred_label = mac_test_copy_cred_label, .mpo_copy_mbuf_label = mac_test_copy_mbuf_label, .mpo_copy_pipe_label = mac_test_copy_pipe_label, .mpo_copy_socket_label = mac_test_copy_socket_label, @@ -1932,7 +1933,6 @@ .mpo_relabel_ifnet = mac_test_relabel_ifnet, .mpo_update_ipq = mac_test_update_ipq, .mpo_inpcb_sosetlabel = mac_test_inpcb_sosetlabel, - .mpo_create_cred = mac_test_create_cred, .mpo_execve_transition = mac_test_execve_transition, .mpo_execve_will_transition = mac_test_execve_will_transition, .mpo_create_proc0 = mac_test_create_proc0, ==== //depot/projects/hammer/sys/sys/mac.h#16 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac.h,v 1.51 2003/11/18 00:39:07 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac.h,v 1.52 2003/12/06 21:48:03 rwatson Exp $ */ /* * Userland/kernel interface for Mandatory Access Control. @@ -229,7 +229,7 @@ /* * Labeling event operations: processes. */ -void mac_create_cred(struct ucred *cred_parent, struct ucred *cred_child); +void mac_copy_cred(struct ucred *cr1, struct ucred *cr2); int mac_execve_enter(struct image_params *imgp, struct mac *mac_p); void mac_execve_exit(struct image_params *imgp); void mac_execve_transition(struct ucred *old, struct ucred *new, ==== //depot/projects/hammer/sys/sys/mac_policy.h#15 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac_policy.h,v 1.45 2003/11/18 00:39:07 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac_policy.h,v 1.46 2003/12/06 21:48:03 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. @@ -111,6 +111,8 @@ void (*mpo_destroy_pipe_label)(struct label *label); void (*mpo_destroy_proc_label)(struct label *label); void (*mpo_destroy_vnode_label)(struct label *label); + void (*mpo_copy_cred_label)(struct label *src, + struct label *dest); void (*mpo_copy_mbuf_label)(struct label *src, struct label *dest); void (*mpo_copy_pipe_label)(struct label *src, @@ -264,8 +266,6 @@ /* * Labeling event operations: processes. */ - void (*mpo_create_cred)(struct ucred *parent_cred, - struct ucred *child_cred); void (*mpo_execve_transition)(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *vnodelabel, struct label *interpvnodelabel,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312062329.hB6NTjOA076042>