Patch "ipvs: Fix clamp() of ip_vs_conn_tab on small memory systems" has been added to the 6.6-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    ipvs: Fix clamp() of ip_vs_conn_tab on small memory systems

to the 6.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     ipvs-fix-clamp-of-ip_vs_conn_tab-on-small-memory-sys.patch
and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 711d2407225b7e562d6d78513aaf55146fcc3c03
Author: David Laight <David.Laight@xxxxxxxxxx>
Date:   Sat Dec 14 17:30:53 2024 +0000

    ipvs: Fix clamp() of ip_vs_conn_tab on small memory systems
    
    [ Upstream commit cf2c97423a4f89c8b798294d3f34ecfe7e7035c3 ]
    
    The 'max_avail' value is calculated from the system memory
    size using order_base_2().
    order_base_2(x) is defined as '(x) ? fn(x) : 0'.
    The compiler generates two copies of the code that follows
    and then expands clamp(max, min, PAGE_SHIFT - 12) (11 on 32bit).
    This triggers a compile-time assert since min is 5.
    
    In reality a system would have to have less than 512MB memory
    for the bounds passed to clamp to be reversed.
    
    Swap the order of the arguments to clamp() to avoid the warning.
    
    Replace the clamp_val() on the line below with clamp().
    clamp_val() is just 'an accident waiting to happen' and not needed here.
    
    Detected by compile time checks added to clamp(), specifically:
    minmax.h: use BUILD_BUG_ON_MSG() for the lo < hi test in clamp()
    
    Reported-by: Linux Kernel Functional Testing <lkft@xxxxxxxxxx>
    Closes: https://lore.kernel.org/all/CA+G9fYsT34UkGFKxus63H6UVpYi5GRZkezT9MRLfAbM3f6ke0g@xxxxxxxxxxxxxx/
    Fixes: 4f325e26277b ("ipvs: dynamically limit the connection hash table")
    Tested-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
    Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
    Signed-off-by: David Laight <david.laight@xxxxxxxxxx>
    Acked-by: Julian Anastasov <ja@xxxxxx>
    Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 9065da3cdd12..8182833a3582 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -1494,8 +1494,8 @@ int __init ip_vs_conn_init(void)
 	max_avail -= 2;		/* ~4 in hash row */
 	max_avail -= 1;		/* IPVS up to 1/2 of mem */
 	max_avail -= order_base_2(sizeof(struct ip_vs_conn));
-	max = clamp(max, min, max_avail);
-	ip_vs_conn_tab_bits = clamp_val(ip_vs_conn_tab_bits, min, max);
+	max = clamp(max_avail, min, max);
+	ip_vs_conn_tab_bits = clamp(ip_vs_conn_tab_bits, min, max);
 	ip_vs_conn_tab_size = 1 << ip_vs_conn_tab_bits;
 	ip_vs_conn_tab_mask = ip_vs_conn_tab_size - 1;