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

Commit c63cbc46 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: use switch() to handle verdict cases from nf_hook_slow() 



Use switch() for verdict handling and add explicit handling for
NF_STOLEN and other non-conventional verdicts.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 0e5a1c7e

net/netfilter/core.c

+14 −4
Original line number Diff line number Diff line
@@ -328,22 +328,32 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state) 
{

	struct nf_hook_entry *entry;

	unsigned int verdict;

	int ret = 0;

	int ret;



	entry = rcu_dereference(state->hook_entries);

next_hook:

	verdict = nf_iterate(skb, state, &entry);

	if (verdict == NF_ACCEPT) {

	switch (verdict & NF_VERDICT_MASK) {

	case NF_ACCEPT:

		ret = 1;

	} else if ((verdict & NF_VERDICT_MASK) == NF_DROP) {

		break;

	case NF_DROP:

		kfree_skb(skb);

		ret = NF_DROP_GETERR(verdict);

		if (ret == 0)

			ret = -EPERM;

	} else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) {

		break;

	case NF_QUEUE:

		ret = nf_queue(skb, state, &entry, verdict);

		if (ret == 1 && entry)

			goto next_hook;

		/* Fall through. */

	default:

		/* Implicit handling for NF_STOLEN, as well as any other non

		 * conventional verdicts.

		 */

		ret = 0;

		break;

	}

	return ret;

}