From: Josh Hunt <johunt@akamai•com>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, tom@herbertland•com
Subject: Re: [PATCH] ipv6: Fix protocol resubmission
Date: Fri, 29 May 2015 14:59:34 -0500 [thread overview]
Message-ID: <5568C526.4060502@akamai.com> (raw)
In-Reply-To: <1432929391-14148-1-git-send-email-johunt@akamai.com>
On 05/29/2015 02:56 PM, Josh Hunt wrote:
> I came across this problem while trying to use UDP encapsulation with IPv6. The
> change below fixes that, but it was not immediately apparent if there are any
> other protocols relying on this broken behavior. FWIW the behavior below now
> matches IPv4.
>
> Josh
> ---
>
> UDP encapsulation is broken on IPv6 because it expects when it returns a negative
> value that the packet will be resubmitted to the stack with the handler corresponding
> to the return value. The check currently looks for return values > 0 and then resubmits.
>
> This patch fixes that check and also moves the resubmit label to take advantage of
> the return code identifying the next protocol we want to process.
>
> Signed-off-by: Josh Hunt <johunt@akamai•com>
> ---
> net/ipv6/ip6_input.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
> index f2e464e..a4c1026 100644
> --- a/net/ipv6/ip6_input.c
> +++ b/net/ipv6/ip6_input.c
> @@ -212,13 +212,13 @@ static int ip6_input_finish(struct sock *sk, struct sk_buff *skb)
> */
>
> rcu_read_lock();
> -resubmit:
> idev = ip6_dst_idev(skb_dst(skb));
> if (!pskb_pull(skb, skb_transport_offset(skb)))
> goto discard;
> nhoff = IP6CB(skb)->nhoff;
> nexthdr = skb_network_header(skb)[nhoff];
>
> +resubmit:
> raw = raw6_local_deliver(skb, nexthdr);
> ipprot = rcu_dereference(inet6_protos[nexthdr]);
> if (ipprot) {
> @@ -246,7 +246,7 @@ resubmit:
> goto discard;
>
> ret = ipprot->handler(skb);
> - if (ret > 0)
> + if (ret < 0)
> goto resubmit;
> else if (ret == 0)
> IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDELIVERS);
>
Please ignore, sending v2.
Josh
prev parent reply other threads:[~2015-05-29 19:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-29 19:56 [PATCH] ipv6: Fix protocol resubmission Josh Hunt
2015-05-29 19:59 ` Josh Hunt [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=5568C526.4060502@akamai.com \
--to=johunt@akamai$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=tom@herbertland$(echo .)com \
/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