netdev - Re: [PATCH v5 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <fb240cbb-09ab-69c4-2b4c-44a50e5a308c@miraclelinux.com>
Date:   Tue, 27 Sep 2016 19:20:49 +0900
From:   YOSHIFUJI Hideaki <hideaki.yoshifuji@...aclelinux.com>
To:     Maciej Żenczykowski <zenczykowski@...il.com>,
        Maciej Żenczykowski <maze@...gle.com>,
        "David S . Miller" <davem@...emloft.net>
Cc:     hideaki.yoshifuji@...aclelinux.com, netdev@...r.kernel.org,
        Erik Kline <ek@...gle.com>,
        Lorenzo Colitti <lorenzo@...gle.com>,
        Hannes Frederic Sowa <hannes@...essinduktion.org>
Subject: Re: [PATCH v5 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited



Maciej Żenczykowski wrote:
> From: Maciej Żenczykowski <maze@...gle.com>
> 
> This allows setting /proc/sys/net/ipv6/conf/*/router_solicitations
> to -1 meaning an unlimited number of retransmits.
> 

We could say "< 0 means infinite" and we can reduce changes here.

--yoshfuji

> Signed-off-by: Maciej Żenczykowski <maze@...gle.com>
> ---
>  net/ipv6/addrconf.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
> index 8bd2d06eefe7..1e59c0034916 100644
> --- a/net/ipv6/addrconf.c
> +++ b/net/ipv6/addrconf.c
> @@ -3687,7 +3687,7 @@ static void addrconf_rs_timer(unsigned long data)
>  	if (idev->if_flags & IF_RA_RCVD)
>  		goto out;
>  
> -	if (idev->rs_probes++ < idev->cnf.rtr_solicits) {
> +	if (idev->rs_probes++ < idev->cnf.rtr_solicits || idev->cnf.rtr_solicits == -1) {
>  		write_unlock(&idev->lock);
>  		if (!ipv6_get_lladdr(dev, &lladdr, IFA_F_TENTATIVE))
>  			ndisc_send_rs(dev, &lladdr,
> @@ -3949,7 +3949,7 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp)
>  	send_mld = ifp->scope == IFA_LINK && ipv6_lonely_lladdr(ifp);
>  	send_rs = send_mld &&
>  		  ipv6_accept_ra(ifp->idev) &&
> -		  ifp->idev->cnf.rtr_solicits > 0 &&
> +		  ifp->idev->cnf.rtr_solicits != 0 &&
>  		  (dev->flags&IFF_LOOPBACK) == 0;
>  	read_unlock_bh(&ifp->idev->lock);
>  
> @@ -5099,7 +5099,7 @@ static int inet6_set_iftoken(struct inet6_dev *idev, struct in6_addr *token)
>  		return -EINVAL;
>  	if (!ipv6_accept_ra(idev))
>  		return -EINVAL;
> -	if (idev->cnf.rtr_solicits <= 0)
> +	if (idev->cnf.rtr_solicits == 0)
>  		return -EINVAL;
>  
>  	write_lock_bh(&idev->lock);
> @@ -5699,6 +5699,7 @@ int addrconf_sysctl_ignore_routes_with_linkdown(struct ctl_table *ctl,
>  	return ret;
>  }
>  
> +static const int minus_one = -1;
>  static const int one = 1;
>  static const int two_five_five = 255;
>  
> @@ -5759,7 +5760,8 @@ static const struct ctl_table addrconf_sysctl[] = {
>  		.data		= &ipv6_devconf.rtr_solicits,
>  		.maxlen		= sizeof(int),
>  		.mode		= 0644,
> -		.proc_handler	= proc_dointvec,
> +		.proc_handler	= proc_dointvec_minmax,
> +		.extra1		= (void *)&minus_one,
>  	},
>  	{
>  		.procname	= "router_solicitation_interval",
> 

-- 
Hideaki Yoshifuji <hideaki.yoshifuji@...aclelinux.com>
Technical Division, MIRACLE LINUX CORPORATION