mbox series

[nf,0/2] route_me_harder routing loop with tunnels

Message ID 20201029025606.3523771-1-Jason@zx2c4.com (mailing list archive)
Headers show
Series route_me_harder routing loop with tunnels | expand

Message

Jason A. Donenfeld Oct. 29, 2020, 2:56 a.m. UTC
Hi Pablo,

This series fixes a bug in the route_me_harder family of functions with
regards to tunnel interfaces. The first patch contains an addition to
the wireguard test suite; I normally send my wireguard patches through
Dave's tree, but I thought it'd be nice to send these together here
because the test case is illustrative of the issue. The second patch
then fixes the issue with a lengthy explanation of what's going on.

These are intended for net.git/nf.git, not the -next variety, and to
eventually be backported to stable. So, the second patch has a proper
Fixes: line on it to help with that.

Thanks,
Jason

Jason A. Donenfeld (2):
  wireguard: selftests: check that route_me_harder packets use the right
    sk
  netfilter: use actual socket sk rather than skb sk when routing harder

 include/linux/netfilter_ipv4.h                       |  2 +-
 include/linux/netfilter_ipv6.h                       | 10 +++++-----
 net/ipv4/netfilter.c                                 |  8 +++++---
 net/ipv4/netfilter/iptable_mangle.c                  |  2 +-
 net/ipv4/netfilter/nf_reject_ipv4.c                  |  2 +-
 net/ipv6/netfilter.c                                 |  6 +++---
 net/ipv6/netfilter/ip6table_mangle.c                 |  2 +-
 net/netfilter/ipvs/ip_vs_core.c                      |  4 ++--
 net/netfilter/nf_nat_proto.c                         |  4 ++--
 net/netfilter/nf_synproxy_core.c                     |  2 +-
 net/netfilter/nft_chain_route.c                      |  4 ++--
 net/netfilter/utils.c                                |  4 ++--
 tools/testing/selftests/wireguard/netns.sh           |  8 ++++++++
 tools/testing/selftests/wireguard/qemu/kernel.config |  2 ++
 14 files changed, 36 insertions(+), 24 deletions(-)

Comments

Pablo Neira Ayuso Oct. 30, 2020, 7:23 p.m. UTC | #1
On Thu, Oct 29, 2020 at 03:56:04AM +0100, Jason A. Donenfeld wrote:
> Hi Pablo,
> 
> This series fixes a bug in the route_me_harder family of functions with
> regards to tunnel interfaces. The first patch contains an addition to
> the wireguard test suite; I normally send my wireguard patches through
> Dave's tree, but I thought it'd be nice to send these together here
> because the test case is illustrative of the issue. The second patch
> then fixes the issue with a lengthy explanation of what's going on.
> 
> These are intended for net.git/nf.git, not the -next variety, and to
> eventually be backported to stable. So, the second patch has a proper
> Fixes: line on it to help with that.

Series applied, thanks.
Jason A. Donenfeld Oct. 31, 2020, 12:05 a.m. UTC | #2
On Fri, Oct 30, 2020 at 8:23 PM Pablo Neira Ayuso <pablo@netfilter.org> wrote:
>
> On Thu, Oct 29, 2020 at 03:56:04AM +0100, Jason A. Donenfeld wrote:
> > Hi Pablo,
> >
> > This series fixes a bug in the route_me_harder family of functions with
> > regards to tunnel interfaces. The first patch contains an addition to
> > the wireguard test suite; I normally send my wireguard patches through
> > Dave's tree, but I thought it'd be nice to send these together here
> > because the test case is illustrative of the issue. The second patch
> > then fixes the issue with a lengthy explanation of what's going on.
> >
> > These are intended for net.git/nf.git, not the -next variety, and to
> > eventually be backported to stable. So, the second patch has a proper
> > Fixes: line on it to help with that.
>
> Series applied, thanks.

To nf.git? Did you forget to git-push perhaps?

Jason
Pablo Neira Ayuso Oct. 31, 2020, 1 a.m. UTC | #3
On Sat, Oct 31, 2020 at 01:05:03AM +0100, Jason A. Donenfeld wrote:
> On Fri, Oct 30, 2020 at 8:23 PM Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> >
> > On Thu, Oct 29, 2020 at 03:56:04AM +0100, Jason A. Donenfeld wrote:
> > > Hi Pablo,
> > >
> > > This series fixes a bug in the route_me_harder family of functions with
> > > regards to tunnel interfaces. The first patch contains an addition to
> > > the wireguard test suite; I normally send my wireguard patches through
> > > Dave's tree, but I thought it'd be nice to send these together here
> > > because the test case is illustrative of the issue. The second patch
> > > then fixes the issue with a lengthy explanation of what's going on.
> > >
> > > These are intended for net.git/nf.git, not the -next variety, and to
> > > eventually be backported to stable. So, the second patch has a proper
> > > Fixes: line on it to help with that.
> >
> > Series applied, thanks.
> 
> To nf.git?

Yes.

> Did you forget to git-push perhaps?

I usually take a little time to compile test and run tests before
pushing it out.
Pablo Neira Ayuso Oct. 31, 2020, 1:08 a.m. UTC | #4
On Sat, Oct 31, 2020 at 02:00:03AM +0100, Pablo Neira Ayuso wrote:
> On Sat, Oct 31, 2020 at 01:05:03AM +0100, Jason A. Donenfeld wrote:
> > On Fri, Oct 30, 2020 at 8:23 PM Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > >
> > > On Thu, Oct 29, 2020 at 03:56:04AM +0100, Jason A. Donenfeld wrote:
> > > > Hi Pablo,
> > > >
> > > > This series fixes a bug in the route_me_harder family of functions with
> > > > regards to tunnel interfaces. The first patch contains an addition to
> > > > the wireguard test suite; I normally send my wireguard patches through
> > > > Dave's tree, but I thought it'd be nice to send these together here
> > > > because the test case is illustrative of the issue. The second patch
> > > > then fixes the issue with a lengthy explanation of what's going on.
> > > >
> > > > These are intended for net.git/nf.git, not the -next variety, and to
> > > > eventually be backported to stable. So, the second patch has a proper
> > > > Fixes: line on it to help with that.
> > >
> > > Series applied, thanks.
> > 
> > To nf.git?
> 
> Yes.
> 
> > Did you forget to git-push perhaps?
> 
> I usually take a little time to compile test and run tests before
> pushing it out.

offlist.

JFYI: I'll be scheduling a pull request by tomorrow to request
inclusion of these updates into net.git.