[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <52B2ED52.90604@redhat.com>
Date: Thu, 19 Dec 2013 13:57:54 +0100
From: Daniel Borkmann <dborkman@...hat.com>
To: netdev@...r.kernel.org, fengguang.wu@...el.com
CC: "linux-sctp@...r.kernel.org" <linux-sctp@...r.kernel.org>,
Hannes Frederic Sowa <hannes@...essinduktion.org>
Subject: Re: [PATCH net-next] ipv6: move ip6_sk_accept_pmtu from generic pmtu
update path to ipv6 one
On 12/19/2013 12:54 PM, Hannes Frederic Sowa wrote:
> In commit 93b36cf3425b9b ("ipv6: support IPV6_PMTU_INTERFACE on sockets")
> I made a horrible mistake to add ip6_sk_accept_pmtu to the generic
> sctp_icmp_frag_needed path. This results in build warnings if IPv6 is
> disabled which were luckily caught by Fengguang's kbuild bot. But it
> also leads to a kernel panic IPv4 frag-needed packet is received.
>
> Reported-by: kbuild test robot <fengguang.wu@...el.com>
> Signed-off-by: Hannes Frederic Sowa <hannes@...essinduktion.org>
Thanks, also cc'ing linux-sctp.
Fixes: 93b36cf3425b ("ipv6: support IPV6_PMTU_INTERFACE on sockets")
Acked-by: Daniel Borkmann <dborkman@...hat.com>
> ---
> net/sctp/input.c | 3 ---
> net/sctp/ipv6.c | 3 ++-
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/net/sctp/input.c b/net/sctp/input.c
> index 042ec6c..2a192a7 100644
> --- a/net/sctp/input.c
> +++ b/net/sctp/input.c
> @@ -389,9 +389,6 @@ void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc,
> if (!t || (t->pathmtu <= pmtu))
> return;
>
> - if (!ip6_sk_accept_pmtu(sk))
> - return;
> -
> if (sock_owned_by_user(sk)) {
> asoc->pmtu_pending = 1;
> t->pmtu_pending = 1;
> diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
> index 32db816..00bea3f 100644
> --- a/net/sctp/ipv6.c
> +++ b/net/sctp/ipv6.c
> @@ -172,7 +172,8 @@ static void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
>
> switch (type) {
> case ICMPV6_PKT_TOOBIG:
> - sctp_icmp_frag_needed(sk, asoc, transport, ntohl(info));
> + if (ip6_sk_accept_pmtu(sk))
> + sctp_icmp_frag_needed(sk, asoc, transport, ntohl(info));
> goto out_unlock;
> case ICMPV6_PARAMPROB:
> if (ICMPV6_UNK_NEXTHDR == code) {
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists