]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/ipv4: fix sysctl max for fib_multipath_hash_policy
authorMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Mon, 18 Nov 2019 12:46:09 +0000 (09:46 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 29 Nov 2019 09:07:39 +0000 (10:07 +0100)
[ Upstream commit ca749bbb108c24a876014c804f9777c545be4d59 ]

Commit eec4844fae7c ("proc/sysctl: add shared variables for range
check") did:
-               .extra2         = &two,
+               .extra2         = SYSCTL_ONE,
here, which doesn't seem to be intentional, given the changelog.
This patch restores it to the previous, as the value of 2 still makes
sense (used in fib_multipath_hash()).

Fixes: eec4844fae7c ("proc/sysctl: add shared variables for range check")
Cc: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv4/sysctl_net_ipv4.c

index 0b980e84192738362e19ce3a9e921cff23a1449b..c45b7d738cd19a9a744b09960efa02776092cd09 100644 (file)
@@ -1028,7 +1028,7 @@ static struct ctl_table ipv4_net_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_fib_multipath_hash_policy,
                .extra1         = SYSCTL_ZERO,
-               .extra2         = SYSCTL_ONE,
+               .extra2         = &two,
        },
 #endif
        {