diff options
| author | Todd Poynor <toddpoynor@google.com> | 2013-01-15 19:33:11 -0800 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2013-01-15 19:33:11 -0800 |
| commit | fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe (patch) | |
| tree | b7ed0216b986c7a0c8f7ab7f2b77191d9b070ead /security | |
| parent | 2627bab94940583e37f36ffa9f635e35a335c33d (diff) | |
| parent | 2a68fec1118107fbaa40c631d45641d40d88ad71 (diff) | |
| download | kernel_samsung_tuna-fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe.zip kernel_samsung_tuna-fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe.tar.gz kernel_samsung_tuna-fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe.tar.bz2 | |
Merge commit 'v3.0.58' into android-3.0
Change-Id: I05959ed26f71cf9197df59291e8e13f254b2115c
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); |