netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>,
	stable@vger.kernel.org, "Jason A . Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH net 09/10] wireguard: ratelimiter: use kvcalloc() instead of kvzalloc()
Date: Mon, 29 Nov 2021 10:39:28 -0500	[thread overview]
Message-ID: <20211129153929.3457-10-Jason@zx2c4.com> (raw)
In-Reply-To: <20211129153929.3457-1-Jason@zx2c4.com>

From: "Gustavo A. R. Silva" <gustavoars@kernel.org>

Use 2-factor argument form kvcalloc() instead of kvzalloc().

Link: https://github.com/KSPP/linux/issues/162
Cc: stable@vger.kernel.org
Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
[Jason: Gustavo's link above is for KSPP, but this isn't actually a
 security fix, as table_size is bounded to 8192 anyway, and gcc realizes
 this, so the codegen comes out to be about the same.]
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 drivers/net/wireguard/ratelimiter.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireguard/ratelimiter.c b/drivers/net/wireguard/ratelimiter.c
index 3fedd1d21f5e..dd55e5c26f46 100644
--- a/drivers/net/wireguard/ratelimiter.c
+++ b/drivers/net/wireguard/ratelimiter.c
@@ -176,12 +176,12 @@ int wg_ratelimiter_init(void)
 			(1U << 14) / sizeof(struct hlist_head)));
 	max_entries = table_size * 8;
 
-	table_v4 = kvzalloc(table_size * sizeof(*table_v4), GFP_KERNEL);
+	table_v4 = kvcalloc(table_size, sizeof(*table_v4), GFP_KERNEL);
 	if (unlikely(!table_v4))
 		goto err_kmemcache;
 
 #if IS_ENABLED(CONFIG_IPV6)
-	table_v6 = kvzalloc(table_size * sizeof(*table_v6), GFP_KERNEL);
+	table_v6 = kvcalloc(table_size, sizeof(*table_v6), GFP_KERNEL);
 	if (unlikely(!table_v6)) {
 		kvfree(table_v4);
 		goto err_kmemcache;
-- 
2.34.1


  parent reply	other threads:[~2021-11-29 17:50 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-29 15:39 [PATCH net 00/10] wireguard/siphash patches for 5.16-rc6 Jason A. Donenfeld
2021-11-29 15:39 ` [PATCH net 01/10] wireguard: allowedips: add missing __rcu annotation to satisfy sparse Jason A. Donenfeld
2021-11-29 15:39 ` [PATCH net 02/10] wireguard: selftests: increase default dmesg log size Jason A. Donenfeld
2021-11-29 15:39 ` [PATCH net 03/10] wireguard: selftests: actually test for routing loops Jason A. Donenfeld
2021-11-29 15:39 ` [PATCH net 04/10] wireguard: main: rename 'mod_init' & 'mod_exit' functions to be module-specific Jason A. Donenfeld
2021-11-29 15:39 ` [PATCH net 05/10] wireguard: selftests: rename DEBUG_PI_LIST to DEBUG_PLIST Jason A. Donenfeld
2021-11-29 15:39 ` [PATCH net 06/10] wireguard: device: reset peer src endpoint when netns exits Jason A. Donenfeld
2021-11-30 16:00   ` Toke Høiland-Jørgensen
2021-11-29 15:39 ` [PATCH net 07/10] wireguard: receive: use ring buffer for incoming handshakes Jason A. Donenfeld
2021-11-29 15:39 ` [PATCH net 08/10] wireguard: receive: drop handshakes if queue lock is contended Jason A. Donenfeld
2021-11-29 15:39 ` Jason A. Donenfeld [this message]
2021-11-29 15:39 ` [PATCH net 10/10] siphash: use _unaligned version by default Jason A. Donenfeld
2021-11-29 18:17 ` [PATCH net 00/10] wireguard/siphash patches for 5.16-rc6 Jakub Kicinski
2021-11-29 18:18   ` Jason A. Donenfeld

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=20211129153929.3457-10-Jason@zx2c4.com \
    --to=jason@zx2c4.com \
    --cc=davem@davemloft.net \
    --cc=gustavoars@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).