* [PATCH][net-next] net: wireguard: Use kvcalloc() instead of kvzalloc()
@ 2021-09-28 22:17 Gustavo A. R. Silva
2021-09-28 22:35 ` Jason A. Donenfeld
0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2021-09-28 22:17 UTC (permalink / raw)
To: Jason A. Donenfeld, David S. Miller, Jakub Kicinski
Cc: wireguard, netdev, linux-kernel, Gustavo A. R. Silva, linux-hardening
Use 2-factor argument form kvcalloc() instead of kvzalloc().
Link: https://github.com/KSPP/linux/issues/162
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
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.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][net-next] net: wireguard: Use kvcalloc() instead of kvzalloc()
2021-09-28 22:17 [PATCH][net-next] net: wireguard: Use kvcalloc() instead of kvzalloc() Gustavo A. R. Silva
@ 2021-09-28 22:35 ` Jason A. Donenfeld
0 siblings, 0 replies; 2+ messages in thread
From: Jason A. Donenfeld @ 2021-09-28 22:35 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: David S. Miller, Jakub Kicinski, WireGuard mailing list, Netdev,
LKML, linux-hardening
Hi Gustavo,
table_size never exceeds 8192, so there's really not an issue with
integer overflow here. However, I checked the codegen of before/after
this patch, and it looks like gcc realizes this too, and so elides
them to be basically the same. So I'll apply this to the
wireguard-linux tree. Thanks for the patch.
Jason
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-28 22:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-28 22:17 [PATCH][net-next] net: wireguard: Use kvcalloc() instead of kvzalloc() Gustavo A. R. Silva
2021-09-28 22:35 ` Jason A. Donenfeld
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).