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

Commit 166b6b2d authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David S. Miller
Browse files

igmp: Namespaceify igmp_max_msf sysctl knob 



Signed-off-by: default avatarNikolay Borisov <kernel@kyup.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 815c5270

include/linux/igmp.h

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ static inline struct igmpv3_query * 
}



extern int sysctl_igmp_llm_reports;

extern int sysctl_igmp_max_msf;

extern int sysctl_igmp_qrv;



struct ip_sf_socklist {

include/net/netns/ipv4.h

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ struct netns_ipv4 { 
	unsigned int sysctl_tcp_notsent_lowat;



	int sysctl_igmp_max_memberships;

	int sysctl_igmp_max_msf;



	struct ping_group_range ping_group_range;

net/ipv4/igmp.c

+1 −4
Original line number Diff line number Diff line
@@ -107,8 +107,6 @@ 
#include <linux/seq_file.h>

#endif



#define IP_MAX_MSF		10



/* IGMP reports for link-local multicast groups are enabled by default */

int sysctl_igmp_llm_reports __read_mostly = 1;
@@ -1726,7 +1724,6 @@ static struct in_device *ip_mc_find_dev(struct net *net, struct ip_mreqn *imr) 
/*

 *	Join a socket to a group

 */

int sysctl_igmp_max_msf __read_mostly = IP_MAX_MSF;

#ifdef CONFIG_IP_MULTICAST

int sysctl_igmp_qrv __read_mostly = IGMP_QUERY_ROBUSTNESS_VARIABLE;

#endif
@@ -2244,7 +2241,7 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct 
	}

	/* else, add a new source to the filter */



	if (psl && psl->sl_count >= sysctl_igmp_max_msf) {

	if (psl && psl->sl_count >= net->ipv4.sysctl_igmp_max_msf) {

		err = -ENOBUFS;

		goto done;

	}

net/ipv4/ip_sockglue.c

+3 −2
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ static int do_ip_setsockopt(struct sock *sk, int level, 
			    int optname, char __user *optval, unsigned int optlen)

{

	struct inet_sock *inet = inet_sk(sk);

	struct net *net = sock_net(sk);

	int val = 0, err;

	bool needs_rtnl = setsockopt_needs_rtnl(optname);
@@ -910,7 +911,7 @@ static int do_ip_setsockopt(struct sock *sk, int level, 
		}

		/* numsrc >= (1G-4) overflow in 32 bits */

		if (msf->imsf_numsrc >= 0x3ffffffcU ||

		    msf->imsf_numsrc > sysctl_igmp_max_msf) {

		    msf->imsf_numsrc > net->ipv4.sysctl_igmp_max_msf) {

			kfree(msf);

			err = -ENOBUFS;

			break;
@@ -1065,7 +1066,7 @@ static int do_ip_setsockopt(struct sock *sk, int level, 


		/* numsrc >= (4G-140)/128 overflow in 32 bits */

		if (gsf->gf_numsrc >= 0x1ffffff ||

		    gsf->gf_numsrc > sysctl_igmp_max_msf) {

		    gsf->gf_numsrc > net->ipv4.sysctl_igmp_max_msf) {

			err = -ENOBUFS;

			goto mc_msf_out;

		}

net/ipv4/sysctl_net_ipv4.c

+7 −7
Original line number Diff line number Diff line
@@ -367,13 +367,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "igmp_max_msf",

		.data		= &sysctl_igmp_max_msf,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

#ifdef CONFIG_IP_MULTICAST

	{

		.procname	= "igmp_qrv",
@@ -871,6 +864,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "igmp_max_msf",

		.data		= &init_net.ipv4.sysctl_igmp_max_msf,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_keepalive_time",

		.data		= &init_net.ipv4.sysctl_tcp_keepalive_time,