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

Commit 9801c60e authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paul E. McKenney
Browse files

security,rcu: Convert call_rcu(sel_netnode_free) to kfree_rcu() 



The rcu callback sel_netnode_free() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(sel_netnode_free).

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Cc: Eric Paris <eparis@parisplace.org>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent f218a7ee

security/selinux/netnode.c

+2 −18
Original line number Diff line number Diff line
@@ -68,22 +68,6 @@ static LIST_HEAD(sel_netnode_list); 
static DEFINE_SPINLOCK(sel_netnode_lock);

static struct sel_netnode_bkt sel_netnode_hash[SEL_NETNODE_HASH_SIZE];



/**

 * sel_netnode_free - Frees a node entry

 * @p: the entry's RCU field

 *

 * Description:

 * This function is designed to be used as a callback to the call_rcu()

 * function so that memory allocated to a hash table node entry can be

 * released safely.

 *

 */

static void sel_netnode_free(struct rcu_head *p)

{

	struct sel_netnode *node = container_of(p, struct sel_netnode, rcu);

	kfree(node);

}



/**

 * sel_netnode_hashfn_ipv4 - IPv4 hashing function for the node table

 * @addr: IPv4 address
@@ -193,7 +177,7 @@ static void sel_netnode_insert(struct sel_netnode *node) 
			rcu_dereference(sel_netnode_hash[idx].list.prev),

			struct sel_netnode, list);

		list_del_rcu(&tail->list);

		call_rcu(&tail->rcu, sel_netnode_free);

		kfree_rcu(tail, rcu);

	} else

		sel_netnode_hash[idx].size++;

}
@@ -306,7 +290,7 @@ static void sel_netnode_flush(void) 
		list_for_each_entry_safe(node, node_tmp,

					 &sel_netnode_hash[idx].list, list) {

				list_del_rcu(&node->list);

				call_rcu(&node->rcu, sel_netnode_free);

				kfree_rcu(node, rcu);

		}

		sel_netnode_hash[idx].size = 0;

	}