From: KOVACS Krisztian <hidden@balabit.hu>
To: Patrick McHardy <kaber@trash.net>
Cc: David Miller <davem@davemloft.net>,
rostedt@goodmis.org, linux-kernel@vger.kernel.org,
akpm@linux-foundation.org, netfilter-devel@vger.kernel.org,
netdev@vger.kernel.org
Subject: Re: [PATCH] netfilter: Fix build failure when ipv6 but xt_tproxy is built in
Date: Wed, 06 Apr 2011 14:08:50 +0200 [thread overview]
Message-ID: <4D9C57D2.20303@balabit.hu> (raw)
In-Reply-To: <4D9B2BF2.2010606@trash.net>
Hi,
On 04/05/2011 04:49 PM, Patrick McHardy wrote:
>> What about something like this?
>>
>> diff --git a/net/netfilter/xt_TPROXY.c b/net/netfilter/xt_TPROXY.c
>> index dcfd57e..1ef0e56 100644
>> --- a/net/netfilter/xt_TPROXY.c
>> +++ b/net/netfilter/xt_TPROXY.c
>> @@ -283,10 +283,10 @@ tproxy_tg6_v1(struct sk_buff *skb, const struct xt_action_param *par)
>> const struct in6_addr *laddr;
>> __be16 lport;
>> int thoff;
>> - int tproto;
>> + u8 tproto = iph->nexthdr;
>>
>> - tproto = ipv6_find_hdr(skb, &thoff, -1, NULL);
>> - if (tproto < 0) {
>> + thoff = ipv6_skip_exthdr(skb, sizeof(*iph), &tproto);
>> + if (thoff < 0) {
>> pr_debug("unable to find transport header in IPv6 packet, dropping\n");
>> return NF_DROP;
>> }
>
> Looks good to me. Please formally submit this including a Signed-off-by:
> line and I'll push it upstream.
Will do, as soon as I have a chance to run the test suite. Thanks Patrick.
--
KOVACS Krisztian
prev parent reply other threads:[~2011-04-06 12:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1301451199.14261.327.camel@gandalf.stny.rr.com>
2011-03-30 5:35 ` [PATCH] netfilter: Fix build failure when ipv6 but xt_tproxy is built in David Miller
2011-03-30 10:18 ` Steven Rostedt
2011-04-04 13:54 ` Patrick McHardy
2011-04-05 14:43 ` KOVACS Krisztian
2011-04-05 14:49 ` Patrick McHardy
2011-04-06 12:08 ` KOVACS Krisztian [this message]
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=4D9C57D2.20303@balabit.hu \
--to=hidden@balabit.hu \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).