lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 22 Feb 2022 16:11:01 +0800 From: Xiaomeng Tong <xiam0nd.tong@...il.com> To: gregkh@...uxfoundation.org, jirislaby@...nel.org Cc: linux-kernel@...r.kernel.org, Xiaomeng Tong <xiam0nd.tong@...il.com> Subject: [PATCH v2] vt_ioctl: fix potential spectre v1 in VT_DISALLOCATE In VT_ACTIVATE an almost identical code path has been patched with array_index_nospec. In the VT_DISALLOCATE path, the arg is the user input from a system call argument and lately used as a index for vc_cons[index].d access, which can be reached through path like vt_disallocate->vc_busy or vt_disallocate->vc_deallocate. For consistency both code paths should have the same mitigations applied. Also, the code style is adjusted as suggested by Jiri. Signed-off-by: Xiaomeng Tong <xiam0nd.tong@...il.com> Reviewed-by: Jiri Slaby <jirislaby@...nel.org> --- drivers/tty/vt/vt_ioctl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index 580136986..8c685b501 100644 --- a/drivers/tty/vt/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c @@ -898,11 +898,13 @@ int vt_ioctl(struct tty_struct *tty, if (arg > MAX_NR_CONSOLES) return -ENXIO; - if (arg == 0) + if (arg == 0) { vt_disallocate_all(); - else - return vt_disallocate(--arg); - break; + break; + } + + arg = array_index_nospec(arg - 1, MAX_NR_CONSOLES); + return vt_disallocate(arg); case VT_RESIZE: { -- 2.17.1
Powered by blists - more mailing lists