Page MenuHomeFreeBSD
Files F102709180

D47603.diff
No OneTemporary
Actions

D47603.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
@@ -58,8 +58,6 @@
TAILQ_HEAD(rulehead, rule) head;
};
-static struct rules *rules0;
-
static void
toast_rules(struct rules *const rules)
{
@@ -204,19 +202,20 @@
static struct rules *
find_rules(struct prison *const pr, struct prison **const aprp)
{
- struct prison *cpr;
+ struct prison *cpr, *ppr;
struct rules *rules;
- for (cpr = pr;; cpr = cpr->pr_parent) {
+ cpr = pr;
+ for (;;) {
prison_lock(cpr);
- if (cpr == &prison0) {
- rules = rules0;
- break;
- }
rules = osd_jail_get(cpr, mac_do_osd_jail_slot);
if (rules != NULL)
break;
prison_unlock(cpr);
+
+ ppr = cpr->pr_parent;
+ MPASS(ppr != NULL); /* prison0 always has rules. */
+ cpr = ppr;
}
*aprp = cpr;
@@ -265,13 +264,8 @@
rsv = osd_reserve(mac_do_osd_jail_slot);
prison_lock(pr);
- if (pr == &prison0) {
- old_rules = rules0;
- rules0 = rules;
- } else {
- 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, mac_do_osd_jail_slot);
+ osd_jail_set_reserved(pr, mac_do_osd_jail_slot, rsv, rules);
prison_unlock(pr);
if (old_rules != NULL)
toast_rules(old_rules);
@@ -339,7 +333,6 @@
destroy(struct mac_policy_conf *mpc)
{
osd_jail_deregister(mac_do_osd_jail_slot);
- toast_rules(rules0);
}
static int
@@ -452,7 +445,7 @@
struct prison *pr;
mac_do_osd_jail_slot = osd_jail_register(dealloc_osd, osd_methods);
- rules0 = alloc_rules();
+ set_empty_rules(&prison0);
sx_slock(&allprison_lock);
TAILQ_FOREACH(pr, &allprison, pr_list)
set_empty_rules(pr);

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 4:29 AM (21 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14661809
Default Alt Text
D47603.diff (1 KB)

Event Timeline