Skip to content

Commit 4334a6a

Browse files
GustavoARSilvagregkh
authored andcommitted
tty: vt_ioctl: fix potential Spectre v1
commit e97267c upstream. vsa.console 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: drivers/tty/vt/vt_ioctl.c:711 vt_ioctl() warn: potential spectre issue 'vc_cons' [r] Fix this by sanitizing vsa.console before using it to index vc_cons 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> Reviewed-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 57c806b commit 4334a6a

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/tty/vt/vt_ioctl.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
#include <asm/io.h>
3333
#include <linux/uaccess.h>
3434

35+
#include <linux/nospec.h>
36+
3537
#include <linux/kbd_kern.h>
3638
#include <linux/vt_kern.h>
3739
#include <linux/kbd_diacr.h>
@@ -700,6 +702,8 @@ int vt_ioctl(struct tty_struct *tty,
700702
if (vsa.console == 0 || vsa.console > MAX_NR_CONSOLES)
701703
ret = -ENXIO;
702704
else {
705+
vsa.console = array_index_nospec(vsa.console,
706+
MAX_NR_CONSOLES + 1);
703707
vsa.console--;
704708
console_lock();
705709
ret = vc_allocate(vsa.console);

0 commit comments

Comments
 (0)