summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2023-01-20 13:30:40 +0000
committerJakub Kicinski <kuba@kernel.org>2023-01-23 21:37:25 -0800
commit1d1d63b612801b3f0a39b7d4467cad0abd60e5c8 (patch)
tree87f21e16483d19ff80e3de39b4be7246afe530fc /net
parentd6ab640c21ed3b471e42ea783223c396e102c02d (diff)
downloadlinux-stable-1d1d63b612801b3f0a39b7d4467cad0abd60e5c8.tar.gz
linux-stable-1d1d63b612801b3f0a39b7d4467cad0abd60e5c8.tar.bz2
linux-stable-1d1d63b612801b3f0a39b7d4467cad0abd60e5c8.zip
ipv4: prevent potential spectre v1 gadget in ip_metrics_convert()
if (!type) continue; if (type > RTAX_MAX) return -EINVAL; ... metrics[type - 1] = val; @type being used as an array index, we need to prevent cpu speculation or risk leaking kernel memory content. Fixes: 6cf9dfd3bd62 ("net: fib: move metrics parsing to a helper") Signed-off-by: Eric Dumazet <edumazet@google.com> Link: https://lore.kernel.org/r/20230120133040.3623463-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/metrics.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/metrics.c b/net/ipv4/metrics.c
index 7fcfdfd8f9de..0e3ee1532848 100644
--- a/net/ipv4/metrics.c
+++ b/net/ipv4/metrics.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <linux/netlink.h>
+#include <linux/nospec.h>
#include <linux/rtnetlink.h>
#include <linux/types.h>
#include <net/ip.h>
@@ -25,6 +26,7 @@ static int ip_metrics_convert(struct net *net, struct nlattr *fc_mx,
return -EINVAL;
}
+ type = array_index_nospec(type, RTAX_MAX + 1);
if (type == RTAX_CC_ALGO) {
char tmp[TCP_CA_NAME_MAX];