| From 4e3fd721710553832460c179c2ee5ce67ef7f1e0 Mon Sep 17 00:00:00 2001 |
| From: "Gustavo A. R. Silva" <gustavoars@kernel.org> |
| Date: Mon, 29 Nov 2021 10:39:28 -0500 |
| Subject: wireguard: ratelimiter: use kvcalloc() instead of kvzalloc() |
| |
| From: Gustavo A. R. Silva <gustavoars@kernel.org> |
| |
| commit 4e3fd721710553832460c179c2ee5ce67ef7f1e0 upstream. |
| |
| Use 2-factor argument form kvcalloc() instead of kvzalloc(). |
| |
| Link: https://github.com/KSPP/linux/issues/162 |
| 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> |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/wireguard/ratelimiter.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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; |