Skip to content

Commit a95386f

Browse files
GustavoARSilvadavem330
authored andcommitted
nfc: af_nfc: Fix Spectre v1 vulnerability
proto is indirectly controlled by user-space, hence leading to a potential exploitation of the Spectre variant 1 vulnerability. This issue was detected with the help of Smatch: net/nfc/af_nfc.c:42 nfc_sock_create() warn: potential spectre issue 'proto_tab' [w] (local cap) Fix this by sanitizing proto before using it to index proto_tab. Notice that given that speculation windows are large, the policy is to kill the speculation on the first load and not worry if it can be completed with a dependent load/store [1]. [1] https://marc.info/?l=linux-kernel&m=152449131114778&w=2 Signed-off-by: Gustavo A. R. Silva <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent d686026 commit a95386f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

net/nfc/af_nfc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include <linux/nfc.h>
2323
#include <linux/module.h>
24+
#include <linux/nospec.h>
2425

2526
#include "nfc.h"
2627

@@ -37,6 +38,7 @@ static int nfc_sock_create(struct net *net, struct socket *sock, int proto,
3738

3839
if (proto < 0 || proto >= NFC_SOCKPROTO_MAX)
3940
return -EINVAL;
41+
proto = array_index_nospec(proto, NFC_SOCKPROTO_MAX);
4042

4143
read_lock(&proto_tab_lock);
4244
if (proto_tab[proto] && try_module_get(proto_tab[proto]->owner)) {

0 commit comments

Comments
 (0)