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

Commit 85c0805a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull selinux RCU fixlet from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: fix sel_netnode_insert() suspicious rcu dereference
parents 916492b1 88a693b5

security/selinux/netnode.c

+2 −1
Original line number Diff line number Diff line
@@ -174,7 +174,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);

		kfree_rcu(tail, rcu);