Date: Wed, 1 May 2002 15:28:29 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10606 for review Message-ID: <200205012228.g41MSTw01935@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10606 Change 10606 by rwatson@rwatson_curry on 2002/05/01 15:27:44 Implement mpo_create_socket_from_socket() for mac_biba, mac_mls, mac_none, and mac_te. Generally, copy the oldsocket label to newsocket. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#31 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#25 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#22 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#31 (text+ko) ==== @@ -649,6 +649,15 @@ } static void +mac_biba_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + mac_biba_init_label(&newsocket->so_label); + mac_biba_copy_single(&oldsocket->so_label, &newsocket->so_label); +} + +static void mac_biba_relabel_socket(struct ucred *cred, struct socket *socket, struct mac *newlabel) { @@ -1084,6 +1093,8 @@ (macop_t)mac_biba_create_mbuf_from_socket }, { MAC_CREATE_SOCKET, (macop_t)mac_biba_create_socket }, + { MAC_CREATE_SOCKET_FROM_SOCKET, + (macop_t)mac_biba_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_biba_relabel_socket }, { MAC_CREATE_BPFDESC, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#25 (text+ko) ==== @@ -581,6 +581,15 @@ } static void +mac_mls_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + mac_mls_init_label(&newsocket->so_label); + mac_mls_copy_single(&oldsocket->so_label, &newsocket->so_label); +} + +static void mac_mls_relabel_socket(struct ucred *cred, struct socket *socket, struct mac *newlabel) { @@ -1017,6 +1026,8 @@ (macop_t)mac_mls_create_mbuf_from_socket }, { MAC_CREATE_SOCKET, (macop_t)mac_mls_create_socket }, + { MAC_CREATE_SOCKET_FROM_SOCKET, + (macop_t)mac_mls_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_mls_relabel_socket }, { MAC_CREATE_BPFDESC, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#22 (text+ko) ==== @@ -311,6 +311,14 @@ } static void +mac_none_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + /* Initialize socket here. +} + +static void mac_none_relabel_socket(struct ucred *cred, struct socket *socket, struct mac *newlabel) { @@ -634,6 +642,8 @@ (macop_t)mac_none_create_mbuf_from_socket }, { MAC_CREATE_SOCKET, (macop_t)mac_none_create_socket }, + { MAC_CREATE_SOCKET_FROM_SOCKET, + (macop_t)mac_none_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_none_relabel_socket }, { MAC_CREATE_BPFDESC, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#24 (text+ko) ==== @@ -510,6 +510,13 @@ } static void +mac_te_create_object_from_object(struct mac *oldlabel, struct mac *newlabel) +{ + + mac_te_copy_label(oldlabel, newlabel); +} + +static void mac_te_create_mbuf_datagram_from_mbuf_fragmentqueue(struct mbuf *fragmentqueue, struct mbuf *datagram) { @@ -596,6 +603,15 @@ } static void +mac_te_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + mac_te_create_object_from_onject(&oldsocket->so_label, + &newsocket->so_label); +} + +static void mac_te_relabel_socket(struct ucred *cred, struct socket *socket, struct mac *newlabel) { @@ -1095,6 +1111,8 @@ (macop_t)mac_te_create_mbuf_from_socket }, { MAC_CREATE_SOCKET, (macop_t)mac_te_create_socket }, + { MAC_CREATE_SOCKET_FROM_SOCKET, + (macop_t)mac_te_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_te_relabel_socket }, { MAC_CREATE_BPFDESC, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205012228.g41MSTw01935>