Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3482fd90 authored by Paul Moore's avatar Paul Moore Committed by David S. Miller
Browse files

[NetLabel]: add missing rcu_dereference() calls in the LSM domain mapping hash table 


The LSM domain mapping head table pointer was not being referenced via the RCU
safe dereferencing function, rcu_dereference().  This patch adds those missing
calls to the NetLabel code.

This has been tested using recent linux-2.6 git kernels with no visible
regressions.

Signed-off-by: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a2a4df7

net/netlabel/netlabel_domainhash.c

+6 −4
Original line number Diff line number Diff line
@@ -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;

	}
@@ -227,7 +229,7 @@ int netlbl_domhsh_add(struct netlbl_dom_map *entry, 
		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);
@@ -423,7 +425,7 @@ 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],

				&rcu_dereference(netlbl_domhsh)->tbl[iter_bkt],

				list)

			if (iter_entry->valid) {

				if (chain_cnt++ < *skip_chain)