Commit ed78d09d authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: make nf_queue_entry_get_refs return void 



We don't care if module is being unloaded anymore since hook unregister
handling will destroy queue entries using that hook.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 2ffbceb2

include/net/netfilter/nf_queue.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ void nf_register_queue_handler(const struct nf_queue_handler *qh); 
void nf_unregister_queue_handler(void);

void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);



bool nf_queue_entry_get_refs(struct nf_queue_entry *entry);

void nf_queue_entry_get_refs(struct nf_queue_entry *entry);

void nf_queue_entry_release_refs(struct nf_queue_entry *entry);



static inline void init_hashrandom(u32 *jhash_initval)

net/netfilter/core.c

+0 −2
Original line number Diff line number Diff line
@@ -313,8 +313,6 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state) 
		int err = nf_queue(skb, elem, state,

				   verdict >> NF_VERDICT_QBITS);

		if (err < 0) {

			if (err == -ECANCELED)

				goto next_hook;

			if (err == -ESRCH &&

			   (verdict & NF_VERDICT_FLAG_QUEUE_BYPASS))

				goto next_hook;

net/netfilter/nf_queue.c

+2 −9
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void nf_queue_entry_release_refs(struct nf_queue_entry *entry) 
EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);



/* Bump dev refs so they don't vanish while packet is out */

bool nf_queue_entry_get_refs(struct nf_queue_entry *entry)

void nf_queue_entry_get_refs(struct nf_queue_entry *entry)

{

	struct nf_hook_state *state = &entry->state;
@@ -95,8 +95,6 @@ bool nf_queue_entry_get_refs(struct nf_queue_entry *entry) 
			dev_hold(physdev);

	}

#endif



	return true;

}

EXPORT_SYMBOL_GPL(nf_queue_entry_get_refs);
@@ -151,10 +149,7 @@ int nf_queue(struct sk_buff *skb, 
		.size	= sizeof(*entry) + afinfo->route_key_size,

	};



	if (!nf_queue_entry_get_refs(entry)) {

		status = -ECANCELED;

		goto err_unlock;

	}

	nf_queue_entry_get_refs(entry);

	skb_dst_force(skb);

	afinfo->saveroute(skb, entry);

	status = qh->outfn(entry, queuenum);
@@ -215,8 +210,6 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict) 
		err = nf_queue(skb, elem, &entry->state,

			       verdict >> NF_VERDICT_QBITS);

		if (err < 0) {

			if (err == -ECANCELED)

				goto next_hook;

			if (err == -ESRCH &&

			   (verdict & NF_VERDICT_FLAG_QUEUE_BYPASS))

				goto next_hook;

net/netfilter/nfnetlink_queue.c

+4 −7
Original line number Diff line number Diff line
@@ -606,12 +606,9 @@ static struct nf_queue_entry * 
nf_queue_entry_dup(struct nf_queue_entry *e)

{

	struct nf_queue_entry *entry = kmemdup(e, e->size, GFP_ATOMIC);

	if (entry) {

		if (nf_queue_entry_get_refs(entry))

	if (entry)

		nf_queue_entry_get_refs(entry);

	return entry;

		kfree(entry);

	}

	return NULL;

}



#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
@@ -706,7 +703,7 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum) 
	nf_bridge_adjust_skb_data(skb);

	segs = skb_gso_segment(skb, 0);

	/* Does not use PTR_ERR to limit the number of error codes that can be

	 * returned by nf_queue.  For instance, callers rely on -ECANCELED to

	 * returned by nf_queue.  For instance, callers rely on -ESRCH to

	 * mean 'ignore this hook'.

	 */

	if (IS_ERR_OR_NULL(segs))