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

Commit 6705e867 authored by Michael Wang's avatar Michael Wang Committed by Pablo Neira Ayuso
Browse files

netfilter: replace list_for_each_continue_rcu with new interface 



This patch replaces list_for_each_continue_rcu() with
list_for_each_entry_continue_rcu() to allow removing
list_for_each_continue_rcu().

Signed-off-by: default avatarMichael Wang <wangyun@linux.vnet.ibm.com>
Reviewed-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 2834a638

net/netfilter/core.c

+6 −4
Original line number Diff line number Diff line
@@ -131,14 +131,13 @@ unsigned int nf_iterate(struct list_head *head, 
			int hook_thresh)

{

	unsigned int verdict;

	struct nf_hook_ops *elem = list_entry_rcu(*i, struct nf_hook_ops, list);



	/*

	 * The caller must not block between calls to this

	 * function because of risk of continuing from deleted element.

	 */

	list_for_each_continue_rcu(*i, head) {

		struct nf_hook_ops *elem = (struct nf_hook_ops *)*i;



	list_for_each_entry_continue_rcu(elem, head, list) {

		if (hook_thresh > elem->priority)

			continue;
@@ -155,11 +154,14 @@ unsigned int nf_iterate(struct list_head *head, 
				continue;

			}

#endif

			if (verdict != NF_REPEAT)

			if (verdict != NF_REPEAT) {

				*i = &elem->list;

				return verdict;

			}

			goto repeat;

		}

	}

	*i = &elem->list;

	return NF_ACCEPT;

}