Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4edfa9d0 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Merge tag 'ipvs-fixes2-for-v4.7' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs 



Simon Horman says:

====================
Second Round of IPVS Fixes for v4.7

The fix from Quentin Armitage allows the backup sync daemon to
be bound to a link-local mcast IPv6 address as is already the case
for IPv4.
====================

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parents c8607e02 3777ed68

net/netfilter/ipvs/ip_vs_sync.c

+4 −2
Original line number Diff line number Diff line
@@ -1545,7 +1545,8 @@ static struct socket *make_send_sock(struct netns_ipvs *ipvs, int id) 
/*

 *      Set up receiving multicast socket over UDP

 */

static struct socket *make_receive_sock(struct netns_ipvs *ipvs, int id)

static struct socket *make_receive_sock(struct netns_ipvs *ipvs, int id,

					int ifindex)

{

	/* multicast addr */

	union ipvs_sockaddr mcast_addr;
@@ -1566,6 +1567,7 @@ static struct socket *make_receive_sock(struct netns_ipvs *ipvs, int id) 
		set_sock_size(sock->sk, 0, result);



	get_mcast_sockaddr(&mcast_addr, &salen, &ipvs->bcfg, id);

	sock->sk->sk_bound_dev_if = ifindex;

	result = sock->ops->bind(sock, (struct sockaddr *)&mcast_addr, salen);

	if (result < 0) {

		pr_err("Error binding to the multicast addr\n");
@@ -1868,7 +1870,7 @@ int start_sync_thread(struct netns_ipvs *ipvs, struct ipvs_sync_daemon_cfg *c, 
		if (state == IP_VS_STATE_MASTER)

			sock = make_send_sock(ipvs, id);

		else

			sock = make_receive_sock(ipvs, id);

			sock = make_receive_sock(ipvs, id, dev->ifindex);

		if (IS_ERR(sock)) {

			result = PTR_ERR(sock);

			goto outtinfo;