Page MenuHomeFreeBSD
Files F147906083

D47772.1784749609.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D47772.1784749609.diff
View Options

diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c
--- a/sys/security/mac_do/mac_do.c
+++ b/sys/security/mac_do/mac_do.c
@@ -36,7 +36,7 @@
#define MAC_RULE_STRING_LEN 1024
-static unsigned mac_do_osd_jail_slot;
+static unsigned osd_jail_slot;
#define RULE_INVALID 0 /* Must stay 0. */
#define RULE_UID 1
@@ -288,7 +288,7 @@
cpr = pr;
for (;;) {
prison_lock(cpr);
- rules = osd_jail_get(cpr, mac_do_osd_jail_slot);
+ rules = osd_jail_get(cpr, osd_jail_slot);
if (rules != NULL)
break;
prison_unlock(cpr);
@@ -303,7 +303,7 @@
}
/*
- * OSD destructor for slot 'mac_do_osd_jail_slot'.
+ * OSD destructor for slot 'osd_jail_slot'.
*
* Called with 'value' not NULL.
*/
@@ -321,14 +321,14 @@
* In practice, this means that the rules become inherited (from the closest
* ascendant that has some).
*
- * Destroys the 'mac_do_osd_jail_slot' slot of the passed jail.
+ * Destroys the 'osd_jail_slot' slot of the passed jail.
*/
static void
remove_rules(struct prison *const pr)
{
prison_lock(pr);
/* This calls destructor dealloc_osd(). */
- osd_jail_del(pr, mac_do_osd_jail_slot);
+ osd_jail_del(pr, osd_jail_slot);
prison_unlock(pr);
}
@@ -341,11 +341,11 @@
struct rules *old_rules;
void **rsv;
- rsv = osd_reserve(mac_do_osd_jail_slot);
+ rsv = osd_reserve(osd_jail_slot);
prison_lock(pr);
- old_rules = osd_jail_get(pr, mac_do_osd_jail_slot);
- osd_jail_set_reserved(pr, mac_do_osd_jail_slot, rsv, rules);
+ old_rules = osd_jail_get(pr, osd_jail_slot);
+ osd_jail_set_reserved(pr, osd_jail_slot, rsv, rules);
prison_unlock(pr);
if (old_rules != NULL)
toast_rules(old_rules);
@@ -621,7 +621,7 @@
{
struct prison *pr;
- mac_do_osd_jail_slot = osd_jail_register(dealloc_osd, osd_methods);
+ osd_jail_slot = osd_jail_register(dealloc_osd, osd_methods);
set_empty_rules(&prison0);
sx_slock(&allprison_lock);
TAILQ_FOREACH(pr, &allprison, pr_list)
@@ -632,7 +632,7 @@
static void
mac_do_destroy(struct mac_policy_conf *mpc)
{
- osd_jail_deregister(mac_do_osd_jail_slot);
+ osd_jail_deregister(osd_jail_slot);
}
static bool

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 7:46 PM (13 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29230626
Default Alt Text
D47772.1784749609.diff (2 KB)

Event Timeline