Commit 724a7636 authored Sep 03, 2015 by David S. Miller

Merge branch 'sctp-fixes'



Marcelo Ricardo Leitner says:

====================
couple of sctp fixes for 0ca50d12

These are two fixes for sctp after my patch on 0ca50d12 ("sctp: fix
src address selection if using secondary addresses")

The first, fix a dst leak on those it decided to skip.

The second, adds the fallback on src selection that Vlad had asked
about. Unfortunatelly a lot of ipvs setups relies on the old behavior
and I don't see a better fix for it.

Please consider both to -stable tree.
====================

Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parents 4548a697 410f0383

net/sctp/protocol.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -506,14 +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)
		if (!odev \|\| odev->ifindex != fl4->flowi4_oif) {
		if (&rt->dst != dst)
		dst_release(&rt->dst);
		continue;
		}

		if (dst != &rt->dst)
		dst_release(dst);
		dst = &rt->dst;
		break;
		}