Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[powerpc.git] / net / netlabel / netlabel_domainhash.c

diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
index af4371d..b3675bd 100644 (file)
--- a/net/netlabel/netlabel_domainhash.c
+++ b/net/netlabel/netlabel_domainhash.c
@@ -126,7 +126,9 @@ static struct netlbl_dom_map *netlbl_domhsh_search(const char *domain, u32 def)
 
        if (domain != NULL) {
                bkt = netlbl_domhsh_hash(domain);
-               list_for_each_entry_rcu(iter, &netlbl_domhsh->tbl[bkt], list)
+               list_for_each_entry_rcu(iter,
+                                    &rcu_dereference(netlbl_domhsh)->tbl[bkt],
+                                    list)
                        if (iter->valid && strcmp(iter->domain, domain) == 0)
                                return iter;
        }
@@ -176,11 +178,9 @@ int netlbl_domhsh_init(u32 size)
        for (iter = 0; iter < hsh_tbl->size; iter++)
                INIT_LIST_HEAD(&hsh_tbl->tbl[iter]);
 
-       rcu_read_lock();
        spin_lock(&netlbl_domhsh_lock);
        rcu_assign_pointer(netlbl_domhsh, hsh_tbl);
        spin_unlock(&netlbl_domhsh_lock);
-       rcu_read_unlock();
 
        return 0;
 }
@@ -202,7 +202,6 @@ int netlbl_domhsh_add(struct netlbl_dom_map *entry,
        int ret_val;
        u32 bkt;
        struct audit_buffer *audit_buf;
-       char *audit_domain;
 
        switch (entry->type) {
        case NETLBL_NLTYPE_UNLABELED:
@@ -221,18 +220,17 @@ int netlbl_domhsh_add(struct netlbl_dom_map *entry,
        entry->valid = 1;
        INIT_RCU_HEAD(&entry->rcu);
 
-       ret_val = 0;
        rcu_read_lock();
        if (entry->domain != NULL) {
                bkt = netlbl_domhsh_hash(entry->domain);
                spin_lock(&netlbl_domhsh_lock);
                if (netlbl_domhsh_search(entry->domain, 0) == NULL)
                        list_add_tail_rcu(&entry->list,
-                                         &netlbl_domhsh->tbl[bkt]);
+                                   &rcu_dereference(netlbl_domhsh)->tbl[bkt]);
                else
                        ret_val = -EEXIST;
                spin_unlock(&netlbl_domhsh_lock);
-       } else if (entry->domain == NULL) {
+       } else {
                INIT_LIST_HEAD(&entry->list);
                spin_lock(&netlbl_domhsh_def_lock);
                if (rcu_dereference(netlbl_domhsh_def) == NULL)
@@ -240,28 +238,25 @@ int netlbl_domhsh_add(struct netlbl_dom_map *entry,
                else
                        ret_val = -EEXIST;
                spin_unlock(&netlbl_domhsh_def_lock);
-       } else
-               ret_val = -EINVAL;
-
-       if (entry->domain != NULL)
-               audit_domain = entry->domain;
-       else
-               audit_domain = "(default)";
+       }
        audit_buf = netlbl_audit_start_common(AUDIT_MAC_MAP_ADD, audit_info);
-       audit_log_format(audit_buf, " nlbl_domain=%s", audit_domain);
-       switch (entry->type) {
-       case NETLBL_NLTYPE_UNLABELED:
-               audit_log_format(audit_buf, " nlbl_protocol=unlbl");
-               break;
-       case NETLBL_NLTYPE_CIPSOV4:
+       if (audit_buf != NULL) {
                audit_log_format(audit_buf,
-                                " nlbl_protocol=cipsov4 cipso_doi=%u",
-                                entry->type_def.cipsov4->doi);
-               break;
+                                " nlbl_domain=%s",
+                                entry->domain ? entry->domain : "(default)");
+               switch (entry->type) {
+               case NETLBL_NLTYPE_UNLABELED:
+                       audit_log_format(audit_buf, " nlbl_protocol=unlbl");
+                       break;
+               case NETLBL_NLTYPE_CIPSOV4:
+                       audit_log_format(audit_buf,
+                                        " nlbl_protocol=cipsov4 cipso_doi=%u",
+                                        entry->type_def.cipsov4->doi);
+                       break;
+               }
+               audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0);
+               audit_log_end(audit_buf);
        }
-       audit_log_format(audit_buf, " res=%u", ret_val == 0 ? 1 : 0);
-       audit_log_end(audit_buf);
-
        rcu_read_unlock();
 
        if (ret_val != 0) {
@@ -310,60 +305,48 @@ int netlbl_domhsh_remove(const char *domain, struct netlbl_audit *audit_info)
        int ret_val = -ENOENT;
        struct netlbl_dom_map *entry;
        struct audit_buffer *audit_buf;
-       char *audit_domain;
 
        rcu_read_lock();
-       if (domain != NULL)
-               entry = netlbl_domhsh_search(domain, 0);
-       else
-               entry = netlbl_domhsh_search(domain, 1);
+       entry = netlbl_domhsh_search(domain, (domain != NULL ? 0 : 1));
        if (entry == NULL)
                goto remove_return;
        switch (entry->type) {
-       case NETLBL_NLTYPE_UNLABELED:
-               break;
        case NETLBL_NLTYPE_CIPSOV4:
-               ret_val = cipso_v4_doi_domhsh_remove(entry->type_def.cipsov4,
-                                                    entry->domain);
-               if (ret_val != 0)
-                       goto remove_return;
+               cipso_v4_doi_domhsh_remove(entry->type_def.cipsov4,
+                                          entry->domain);
                break;
        }
-       ret_val = 0;
        if (entry != rcu_dereference(netlbl_domhsh_def)) {
                spin_lock(&netlbl_domhsh_lock);
                if (entry->valid) {
                        entry->valid = 0;
                        list_del_rcu(&entry->list);
-               } else
-                       ret_val = -ENOENT;
+                       ret_val = 0;
+               }
                spin_unlock(&netlbl_domhsh_lock);
        } else {
                spin_lock(&netlbl_domhsh_def_lock);
                if (entry->valid) {
                        entry->valid = 0;
                        rcu_assign_pointer(netlbl_domhsh_def, NULL);
-               } else
-                       ret_val = -ENOENT;
+                       ret_val = 0;
+               }
                spin_unlock(&netlbl_domhsh_def_lock);
        }
 
-       if (entry->domain != NULL)
-               audit_domain = entry->domain;
-       else
-               audit_domain = "(default)";
        audit_buf = netlbl_audit_start_common(AUDIT_MAC_MAP_DEL, audit_info);
-       audit_log_format(audit_buf,
-                        " nlbl_domain=%s res=%u",
-                        audit_domain,
-                        ret_val == 0 ? 1 : 0);
-       audit_log_end(audit_buf);
-
-       if (ret_val == 0)
-               call_rcu(&entry->rcu, netlbl_domhsh_free_entry);
+       if (audit_buf != NULL) {
+               audit_log_format(audit_buf,
+                                " nlbl_domain=%s res=%u",
+                                entry->domain ? entry->domain : "(default)",
+                                ret_val == 0 ? 1 : 0);
+               audit_log_end(audit_buf);
+       }
 
 remove_return:
        rcu_read_unlock();
+       if (ret_val == 0)
+               call_rcu(&entry->rcu, netlbl_domhsh_free_entry);
        return ret_val;
 }
 
@@ -427,8 +410,8 @@ int netlbl_domhsh_walk(u32 *skip_bkt,
             iter_bkt < rcu_dereference(netlbl_domhsh)->size;
             iter_bkt++, chain_cnt = 0) {
                list_for_each_entry_rcu(iter_entry,
-                                       &netlbl_domhsh->tbl[iter_bkt],
-                                       list)
+                               &rcu_dereference(netlbl_domhsh)->tbl[iter_bkt],
+                               list)
                        if (iter_entry->valid) {
                                if (chain_cnt++ < *skip_chain)
                                        continue;