netfilter: nf_queue: move hookfn registration out of struct net

Browse source

This was done to detect when the pernet->init() function was not called
yet, by checking if net->nf.queue_handler is NULL.

Once the nfnetlink_queue module is active, all struct net pointers
contain the same address.  So place this back in nf_queue.c.

Handle the 'netns error unwind' test by checking nfnl_queue_net for a
NULL pointer and add a comment for this.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

...

This commit is contained in:

Florian Westphal 2021-08-05 12:02:43 +02:00 • committed by Pablo Neira Ayuso

parent fdacd57c79

commit 8702997074

4 changed files with 24 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

include/net/netfilter/nf_queue.h

View file

1

include/net/netns/netfilter.h

View file

19

net/netfilter/nf_queue.c

View file

15

net/netfilter/nfnetlink_queue.c

View file