d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move mac_init_label() and mac_destroy_label() from mac_framework.c to

Browse Source 
mac_label.c, and use these instead of replicated code in the label zone
constructor and destructor.

Obtained from:	TrustedBSD Project
This commit is contained in:
Robert Watson 2006-12-28 21:15:37 +00:00
parent a0cacdeada
commit d5fb913feb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=165593
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/security/mac/mac_framework.c
View File

@ -559,25 +559,6 @@ mac_error_select(int error1, int error2)
return (error2);
}
void
mac_init_label(struct label *label)
{
bzero(label, sizeof(*label));
label->l_flags = MAC_FLAG_INITIALIZED;
}
void
mac_destroy_label(struct label *label)
{
KASSERT(label->l_flags & MAC_FLAG_INITIALIZED,
("destroying uninitialized label"));
bzero(label, sizeof(*label));
/* implicit: label->l_flags &= ~MAC_FLAG_INITIALIZED; */
}
int
mac_check_structmac_consistent(struct mac *mac)
{

41
sys/security/mac/mac_label.c
View File

@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include <security/mac/mac_internal.h>
/*
* zone_label is the UMA zone from which all labels are allocated. Label
* zone_label is the UMA zone from which most labels are allocated. Label
* structures are initialized to zero bytes so that policies see a NULL/0
* slot on first use, even if the policy is loaded after the label is
* allocated for an object.
@ -64,6 +64,34 @@ mac_labelzone_init(void)
UMA_ALIGN_PTR, 0);
}
/*
* mac_init_label() and mac_destroy_label() are exported so that they can be
* used in mbuf tag initialization, where labels are not slab allocated from
* the zone_label zone.
*/
void
mac_init_label(struct label *label)
{
bzero(label, sizeof(*label));
label->l_flags = MAC_FLAG_INITIALIZED;
}
void
mac_destroy_label(struct label *label)
{
KASSERT(label->l_flags & MAC_FLAG_INITIALIZED,
("destroying uninitialized label"));
#ifdef DIAGNOSTIC
bzero(label, sizeof(*label));
#else
label->l_flags &= ~MAC_FLAG_INITIALIZED;
#endif
}
static int
mac_labelzone_ctor(void *mem, int size, void *arg, int flags)
{
@ -71,8 +99,7 @@ mac_labelzone_ctor(void *mem, int size, void *arg, int flags)
KASSERT(size == sizeof(*label), ("mac_labelzone_ctor: wrong size\n"));
label = mem;
bzero(label, sizeof(*label));
label->l_flags = MAC_FLAG_INITIALIZED;
mac_init_label(label);
return (0);
}
@ -83,13 +110,7 @@ mac_labelzone_dtor(void *mem, int size, void *arg)
KASSERT(size == sizeof(*label), ("mac_labelzone_dtor: wrong size\n"));
label = mem;
KASSERT(label->l_flags & MAC_FLAG_INITIALIZED,
("mac_labelzone_dtor: label not initialized"));
#ifdef DIAGNOSTIC
bzero(label, sizeof(*label));
#else
label->l_flags &= ~MAC_FLAG_INITIALIZED;
#endif
mac_destroy_label(label);
}
struct label *