netdev - Re: [PATCH v4 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: <CAAedzxq8E8guYP=DK4Uy=c4y1ZSy7Ozn15jYoLNg91TowLgeJQ@mail.gmail.com>
Date:   Mon, 26 Sep 2016 18:23:48 +0900
From:   Erik Kline <ek@...gle.com>
To:     Maciej Żenczykowski <zenczykowski@...il.com>
Cc:     Maciej Żenczykowski <maze@...gle.com>,
        "David S . Miller" <davem@...emloft.net>,
        netdev <netdev@...r.kernel.org>,
        Lorenzo Colitti <lorenzo@...gle.com>
Subject: Re: [PATCH v4 3/7] ipv6 addrconf: rtr_solicits == -1 means unlimited

On 25 September 2016 at 20:03, Maciej Żenczykowski
<zenczykowski@...il.com> 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.
>
> 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 3a835495fb53..6c63bf06fbcf 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 int minus_one = -1;

Same question from part 2: const as well?

>  static int one = 1;
>  static 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         = &minus_one,
>         },
>         {
>                 .procname       = "router_solicitation_interval",
> --
> 2.8.0.rc3.226.g39d4020
>