Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 22:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Paul Moore <paul.moore@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paul Moore 2007-08-07 17:53:10 -07:00 committed by David S. Miller
parent 4a2a4df7b6
commit 3482fd9099
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/netlabel/netlabel_domainhash.c
View File

@ -126,7 +126,9 @@ static struct netlbl_dom_map *netlbl_domhsh_search(const char *domain, u32 def)
if (domain != NULL) { if (domain != NULL) {
bkt = netlbl_domhsh_hash(domain); 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) if (iter->valid && strcmp(iter->domain, domain) == 0)
return iter; return iter;
} }
@ -227,7 +229,7 @@ int netlbl_domhsh_add(struct netlbl_dom_map *entry,
spin_lock(&netlbl_domhsh_lock); spin_lock(&netlbl_domhsh_lock);
if (netlbl_domhsh_search(entry->domain, 0) == NULL) if (netlbl_domhsh_search(entry->domain, 0) == NULL)
list_add_tail_rcu(&entry->list, list_add_tail_rcu(&entry->list,
&netlbl_domhsh->tbl[bkt]); &rcu_dereference(netlbl_domhsh)->tbl[bkt]);
else else
ret_val = -EEXIST; ret_val = -EEXIST;
spin_unlock(&netlbl_domhsh_lock); spin_unlock(&netlbl_domhsh_lock);
@ -423,8 +425,8 @@ int netlbl_domhsh_walk(u32 *skip_bkt,
iter_bkt < rcu_dereference(netlbl_domhsh)->size; iter_bkt < rcu_dereference(netlbl_domhsh)->size;
iter_bkt++, chain_cnt = 0) { iter_bkt++, chain_cnt = 0) {
list_for_each_entry_rcu(iter_entry, list_for_each_entry_rcu(iter_entry,
&netlbl_domhsh->tbl[iter_bkt], &rcu_dereference(netlbl_domhsh)->tbl[iter_bkt],
list) list)
if (iter_entry->valid) { if (iter_entry->valid) {
if (chain_cnt++ < *skip_chain) if (chain_cnt++ < *skip_chain)
continue; continue;