From: ebiederm@xmission•com (Eric W. Biederman)
To: Pablo Neira Ayuso <pablo@netfilter•org>
Cc: David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, netfilter-devel@vger•kernel.org,
Patrick McHardy <kaber@trash•net>
Subject: Re: [PATCH net] netfilter: nf_queue: Don't recompute the hook_list head
Date: Sat, 20 Jun 2015 09:08:20 -0500 [thread overview]
Message-ID: <877fqya2wb.fsf@x220.int.ebiederm.org> (raw)
In-Reply-To: <20150620105839.GB3439@salvia> (Pablo Neira Ayuso's message of "Sat, 20 Jun 2015 12:58:39 +0200")
Pablo Neira Ayuso <pablo@netfilter•org> writes:
> On Fri, Jun 19, 2015 at 05:23:37PM -0500, Eric W. Biederman wrote:
>>
>> If someone sends packets from one of the netdevice ingress hooks to
>> the a userspace queue, and then userspace later accepts the packet,
>> the netfilter code can enter an infinite loop as the list head will
>> never be found.
>>
>> Pass in the saved list_head to avoid this.
>
> There is no userspace queueing for netdevice yet, so this can be route
> through nf-next. Thanks.
*scratches head* the netdevice queueing is in the netfilter core.
netfilter_ingress calls nf_hook_slow. The queuing happens in
nf_hook_slow if anything returns the verdict queue it.
This patch applies to Linus's tree.
So how in the world does this not need to be ported to 4.1?
>> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission•com>
>> ---
>> net/netfilter/nf_queue.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
>> index cd60d397fe05..8a8b2abc35ff 100644
>> --- a/net/netfilter/nf_queue.c
>> +++ b/net/netfilter/nf_queue.c
>> @@ -213,7 +213,7 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
>>
>> if (verdict == NF_ACCEPT) {
>> next_hook:
>> - verdict = nf_iterate(&nf_hooks[entry->state.pf][entry->state.hook],
>> + verdict = nf_iterate(entry->state.hook_list,
>> skb, &entry->state, &elem);
>> }
>>
>> --
>> 2.2.1
>>
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
next prev parent reply other threads:[~2015-06-20 14:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-19 22:23 [PATCH net] netfilter: nf_queue: Don't recompute the hook_list head Eric W. Biederman
2015-06-20 10:58 ` Pablo Neira Ayuso
2015-06-20 14:08 ` Eric W. Biederman [this message]
2015-06-20 18:53 ` Pablo Neira Ayuso
2015-06-22 14:56 ` Eric W. Biederman
2015-06-23 16:17 ` Pablo Neira Ayuso
2015-06-23 16:23 ` Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877fqya2wb.fsf@x220.int.ebiederm.org \
--to=ebiederm@xmission$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=kaber@trash$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=pablo@netfilter$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox