From: Dan Carpenter <dan.carpenter@linaro•org>
To: Julian Anastasov <ja@ssi•bg>
Cc: Simon Horman <horms@verge•net.au>,
Pablo Neira Ayuso <pablo@netfilter•org>,
Jozsef Kadlecsik <kadlec@netfilter•org>,
"David S. Miller" <davem@davemloft•net>,
Eric Dumazet <edumazet@google•com>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
netdev@vger•kernel.org, lvs-devel@vger•kernel.org,
netfilter-devel@vger•kernel.org, coreteam@netfilter•org,
linux-kernel@vger•kernel.org, Bartosz Golaszewski <brgl@bgdev•pl>,
David Laight <David.Laight@aculab•com>
Subject: [PATCH v2 net] ipvs: Fix clamp() order in ip_vs_conn_init()
Date: Wed, 11 Dec 2024 18:56:53 +0300 [thread overview]
Message-ID: <Z1m2RVCy-lkXdDUa@stanley.mountain> (raw)
We recently added some build time asserts to detect incorrect calls to
clamp and it detected this bug which breaks the build. The variable
in this clamp is "max_avail" and it should be the first argument. The
code currently is the equivalent to max = min(max_avail, max).
There probably aren't very many systems out there where we actually can
hit the minimum value so this doesn't affect runtime for most people.
Reported-by: Linux Kernel Functional Testing <lkft@linaro•org>
Closes: https://lore.kernel.org/all/CA+G9fYsT34UkGFKxus63H6UVpYi5GRZkezT9MRLfAbM3f6ke0g@mail.gmail.com/
Suggested-by: David Laight <David.Laight@ACULAB•COM>
Fixes: 4f325e26277b ("ipvs: dynamically limit the connection hash table")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro•org>
Tested-by: Bartosz Golaszewski <bartosz.golaszewski@linaro•org>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro•org>
---
v2: In the commit message, I said max() but it should have been min().
I added a note that this bug probably doesn't affect too many
people in real life. I also added David Laight as a Suggested-by
because he did all the work root causing this bug and he already
sent a similar patch last week.
Added Bartosz's tested by tags.
net/netfilter/ipvs/ip_vs_conn.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 98d7dbe3d787..9f75ac801301 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -1495,7 +1495,7 @@ 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);
+ max = clamp(max_avail, min, max);
ip_vs_conn_tab_bits = clamp_val(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;
--
2.45.2
reply other threads:[~2024-12-11 15:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z1m2RVCy-lkXdDUa@stanley.mountain \
--to=dan.carpenter@linaro$(echo .)org \
--cc=David.Laight@aculab$(echo .)com \
--cc=brgl@bgdev$(echo .)pl \
--cc=coreteam@netfilter$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=horms@verge$(echo .)net.au \
--cc=ja@ssi$(echo .)bg \
--cc=kadlec@netfilter$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=lvs-devel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=pablo@netfilter$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox