diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 | 
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 | 
| commit | b48741cce3be32a48af9a2b272f3f13a077375cf (patch) | |
| tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /security/selinux/netport.c | |
| parent | 54b6c82ac9a124804816f244f587c0f40d25ad01 (diff) | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) | |
Merge branch 'samsung/cleanup' into next/cleanup2
Diffstat (limited to 'security/selinux/netport.c')
| -rw-r--r-- | security/selinux/netport.c | 4 | 
1 files changed, 3 insertions, 1 deletions
diff --git a/security/selinux/netport.c b/security/selinux/netport.c index 0b62bd112461..7b9eb1faf68b 100644 --- a/security/selinux/netport.c +++ b/security/selinux/netport.c @@ -123,7 +123,9 @@ static void sel_netport_insert(struct sel_netport *port)  	if (sel_netport_hash[idx].size == SEL_NETPORT_HASH_BKT_LIMIT) {  		struct sel_netport *tail;  		tail = list_entry( -			rcu_dereference(sel_netport_hash[idx].list.prev), +			rcu_dereference_protected( +				sel_netport_hash[idx].list.prev, +				lockdep_is_held(&sel_netport_lock)),  			struct sel_netport, list);  		list_del_rcu(&tail->list);  		kfree_rcu(tail, rcu);  | 
