Hi,
On Tue, Apr 7, 2015, at 21:30, David Miller wrote:
> From: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
> Date: Tue, 07 Apr 2015 17:45:34 +0200
>
> > On Mo, 2015-04-06 at 23:02 -0700, Tom Herbert wrote:
> >> On Sun, Apr 5, 2015 at 7:19 PM, David Miller <davem@xxxxxxxxxxxxx> wrote:
> >> > diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
> >> > index b6a211a..5cafd92 100644
> >> > --- a/net/ipv6/ip6_tunnel.c
> >> > +++ b/net/ipv6/ip6_tunnel.c
> >> > @@ -1100,7 +1100,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
> >> > ipv6h->nexthdr = proto;
> >> > ipv6h->saddr = fl6->saddr;
> >> > ipv6h->daddr = fl6->daddr;
> >> > - ip6tunnel_xmit(skb, dev);
> >> > + ip6tunnel_xmit(NULL, skb, dev);
> >>
> >> By same should logic iptunnel_xmit call in ip_tunnel_xmit should take
> >> NULL arg for socket?
> >
> > Sure!
> >
> > Thanks, otherwise the patches look good!
> >
> > Acked-by: Hannes Frederic Sowa <hannes@xxxxxxxxxxxxxxxxxxx>
>
> Ok I've made this adjustment and will push the series out, thanks
> everyone.
There is one small problem which already was present before this patch
because of my change b6a7719aedd7e5 ("ipv4: hash net ptr into
fragmentation bucket selection"). It uses sock_net in iptunnel_xmit,
which causes a NULL ptr panic. This patchset did make it more visible
because of the explicit NULL passing but the bug was introduced by my
patch.
Just wanted to let you know if reports are coming in - I fix it up
tomorrow. I will also explore the possibility to give each tunnel at
least a raw socket, what Tom proposed.
Rick Jones identified this, thanks!
Bye,
Hannes
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
