ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ipv4: prevent potential spectre v1 gadget in ip_metrics_convert()

Browse Source 
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: 6cf9dfd3bd ("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>
This commit is contained in:
Eric Dumazet
2023-01-20 13:30:40 +00:00
committed by Jakub Kicinski
parent d6ab640c21
commit 1d1d63b612
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/metrics.c
View File

@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
#include <linux/netlink.h> #include <linux/netlink.h>
#include <linux/nospec.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/types.h> #include <linux/types.h>
#include <net/ip.h> #include <net/ip.h>
@@ -25,6 +26,7 @@ static int ip_metrics_convert(struct net *net, struct nlattr *fc_mx,
return -EINVAL; return -EINVAL;
} }
type = array_index_nospec(type, RTAX_MAX + 1);
if (type == RTAX_CC_ALGO) { if (type == RTAX_CC_ALGO) {
char tmp[TCP_CA_NAME_MAX]; char tmp[TCP_CA_NAME_MAX];