Skip to content

Commit ad43aed

Browse files
GustavoARSilvagregkh
authored andcommitted
atm: zatm: Fix potential Spectre v1
commit 2be147f upstream. 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: stable@vger.kernel.org Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 81b8eb6 commit ad43aed

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/atm/zatm.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <linux/bitops.h>
2424
#include <linux/wait.h>
2525
#include <linux/slab.h>
26+
#include <linux/nospec.h>
2627
#include <asm/byteorder.h>
2728
#include <asm/string.h>
2829
#include <asm/io.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)