summaryrefslogtreecommitdiffstats
path: root/sys/security/mac/mac_framework.h
diff options
context:
space:
mode:
authorcsjp <csjp@FreeBSD.org>2006-12-13 06:00:57 +0000
committercsjp <csjp@FreeBSD.org>2006-12-13 06:00:57 +0000
commit7aaca1dfe10d4d80d7e66bc7a75c3c4b748a375d (patch)
treea1470aff4f14ea393fb7e567b24bca45cd0de2b4 /sys/security/mac/mac_framework.h
parent12c67e24f1ccd313a47bbae43cb1a9c73069d450 (diff)
downloadFreeBSD-src-7aaca1dfe10d4d80d7e66bc7a75c3c4b748a375d.zip
FreeBSD-src-7aaca1dfe10d4d80d7e66bc7a75c3c4b748a375d.tar.gz
Fix LOR between the syncache and inpcb locks when MAC is present in the
kernel. This LOR snuck in with some of the recent syncache changes. To fix this, the inpcb handling was changed: - Hang a MAC label off the syncache object - When the syncache entry is initially created, we pickup the PCB lock is held because we extract information from it while initializing the syncache entry. While we do this, copy the MAC label associated with the PCB and use it for the syncache entry. - When the packet is transmitted, copy the label from the syncache entry to the mbuf so it can be processed by security policies which analyze mbuf labels. This change required that the MAC framework be extended to support the label copy operations from the PCB to the syncache entry, and then from the syncache entry to the mbuf. These functions really should be referencing the syncache structure instead of the label. However, due to some of the complexities associated with exposing this syncache structure we operate directly on it's label pointer. This should be OK since we aren't making any access control decisions within this code directly, we are merely allocating and copying label storage so we can properly initialize mbuf labels for any packets the syncache code might create. This also has a nice side effect of caching. Prior to this change, the PCB would be looked up/locked for each packet transmitted. Now the label is cached at the time the syncache entry is initialized. Submitted by: andre [1] Discussed with: rwatson [1] andre submitted the tcp_syncache.c changes
Diffstat (limited to 'sys/security/mac/mac_framework.h')
-rw-r--r--sys/security/mac/mac_framework.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h
index a895cfe..c8c41c2 100644
--- a/sys/security/mac/mac_framework.h
+++ b/sys/security/mac/mac_framework.h
@@ -210,6 +210,10 @@ void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq);
void mac_inpcb_sosetlabel(struct socket *so, struct inpcb *inp);
void mac_create_mbuf_from_firewall(struct mbuf *m);
+void mac_destroy_syncache(struct label **label);
+int mac_init_syncache(struct label **label);
+void mac_init_syncache_from_inpcb(struct label *label, struct inpcb *inp);
+void mac_create_mbuf_from_syncache(struct label *sc_label, struct mbuf *m);
/*
* Labeling event operations: processes.
*/
OpenPOWER on IntegriCloud