Skip to content

Commit 2be147f

Browse files
GustavoARSilvadavem330
authored andcommitted
atm: zatm: Fix potential Spectre v1
pool can be 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: drivers/atm/zatm.c:1462 zatm_ioctl() warn: potential spectre issue 'zatm_dev->pool_info' (local cap) Fix this by sanitizing pool before using it to index zatm_dev->pool_info 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 Cc: [email protected] Signed-off-by: Gustavo A. R. Silva <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 72f17ba commit 2be147f

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/atm/zatm.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <asm/io.h>
2929
#include <linux/atomic.h>
3030
#include <linux/uaccess.h>
31+
#include <linux/nospec.h>
3132

3233
#include "uPD98401.h"
3334
#include "uPD98402.h"
@@ -1458,6 +1459,8 @@ static int zatm_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
14581459
return -EFAULT;
14591460
if (pool < 0 || pool > ZATM_LAST_POOL)
14601461
return -EINVAL;
1462+
pool = array_index_nospec(pool,
1463+
ZATM_LAST_POOL + 1);
14611464
spin_lock_irqsave(&zatm_dev->lock, flags);
14621465
info = zatm_dev->pool_info[pool];
14631466
if (cmd == ZATM_GETPOOLZ) {

0 commit comments

Comments
 (0)