diff options
| author | Eric Dumazet <edumazet@google.com> | 2023-01-20 13:30:40 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-01 08:27:27 +0100 |
| commit | d50e7348b44f1e046121ff5be01b7fb6978a1149 (patch) | |
| tree | 041afdce1f157a76b0885afdd087f2d541c3f3bf | |
| parent | ead06e3449f222037722df08da8257ebba4d69c9 (diff) | |
| download | linux-d50e7348b44f1e046121ff5be01b7fb6978a1149.tar.gz linux-d50e7348b44f1e046121ff5be01b7fb6978a1149.tar.bz2 linux-d50e7348b44f1e046121ff5be01b7fb6978a1149.zip | |
ipv4: prevent potential spectre v1 gadget in ip_metrics_convert()
[ Upstream commit 1d1d63b612801b3f0a39b7d4467cad0abd60e5c8 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/ipv4/metrics.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/metrics.c b/net/ipv4/metrics.c index 25ea6ac44db9..6a1427916c7d 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> @@ -28,6 +29,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]; |