diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2015-09-02 21:20:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-04 00:43:05 +0200 |
| commit | 410f03831c0768f2b1850d28ba697b167ddcb89b (patch) | |
| tree | e9cc4151a252deba27e10e2ff06a2bd437a80b07 /net | |
| parent | sctp: fix dst leak (diff) | |
| download | linux-410f03831c0768f2b1850d28ba697b167ddcb89b.tar.xz linux-410f03831c0768f2b1850d28ba697b167ddcb89b.zip | |
sctp: add routing output fallback
Commit 0ca50d12fe46 added a restriction that the address must belong to
the output interface, so that sctp will use the right interface even
when using secondary addresses.
But it breaks IPVS setups, on which people is used to attach VIP
addresses to loopback interface on real servers. It's preferred to
attach to the interface actually in use, but it's a very common setup
and that used to work.
This patch then saves the first routing good result, even if it would be
going out through an interface that doesn't have that address. If no
better hit found, it's then used. This effectively restores the original
behavior if no better interface could be found.
Fixes: 0ca50d12fe46 ("sctp: fix src address selection if using secondary addresses")
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/protocol.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 4abf94d4cce7..b7143337e4fa 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -506,16 +506,22 @@ static void sctp_v4_get_dst(struct sctp_transport *t, union sctp_addr *saddr, if (IS_ERR(rt)) continue; + if (!dst) + dst = &rt->dst; + /* Ensure the src address belongs to the output * interface. */ odev = __ip_dev_find(sock_net(sk), laddr->a.v4.sin_addr.s_addr, false); if (!odev || odev->ifindex != fl4->flowi4_oif) { - dst_release(&rt->dst); + if (&rt->dst != dst) + dst_release(&rt->dst); continue; } + if (dst != &rt->dst) + dst_release(dst); dst = &rt->dst; break; } |