diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-12-05 23:06:13 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-12-05 23:07:13 +0700 |
| commit | adbff11f9517c5296e452a1034d05864cf3dbfb3 (patch) | |
| tree | ebe89558e8db50e70c91f316c0f322216f307be7 /security | |
| parent | 15ced1fb4a207c2e99ea007ce447d9b5cd676435 (diff) | |
| parent | 7cd2d7c8aa6c52fbb7c846ab785ef752dd923116 (diff) | |
| download | kernel_samsung_aries-adbff11f9517c5296e452a1034d05864cf3dbfb3.zip kernel_samsung_aries-adbff11f9517c5296e452a1034d05864cf3dbfb3.tar.gz kernel_samsung_aries-adbff11f9517c5296e452a1034d05864cf3dbfb3.tar.bz2 | |
Merge 3.0.54
Change-Id: I68316b1f2af49f27e3462384592d3bba217302b6
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/netnode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c index 3618251..3b2b384 100644 --- a/security/selinux/netnode.c +++ b/security/selinux/netnode.c @@ -190,7 +190,8 @@ static void sel_netnode_insert(struct sel_netnode *node) if (sel_netnode_hash[idx].size == SEL_NETNODE_HASH_BKT_LIMIT) { struct sel_netnode *tail; tail = list_entry( - rcu_dereference(sel_netnode_hash[idx].list.prev), + rcu_dereference_protected(sel_netnode_hash[idx].list.prev, + lockdep_is_held(&sel_netnode_lock)), struct sel_netnode, list); list_del_rcu(&tail->list); call_rcu(&tail->rcu, sel_netnode_free); |