Commit 28cb138f authored by Jakob Koschel's avatar Jakob Koschel Committed by Greg Kroah-Hartman
Browse files

vt_ioctl: add array_index_nospec to VT_ACTIVATE 



in vt_setactivate an almost identical code path has been patched
with array_index_nospec. In the VT_ACTIVATE path the user input
is from a system call argument instead of a usercopy.
For consistency both code paths should have the same mitigations
applied.

Kasper Acknowledgements: Jakob Koschel, Brian Johannesmeyer, Kaveh
Razavi, Herbert Bos, Cristiano Giuffrida from the VUSec group at VU
Amsterdam.

Co-developed-by: default avatarBrian Johannesmeyer <bjohannesmeyer@gmail.com>
Signed-off-by: default avatarBrian Johannesmeyer <bjohannesmeyer@gmail.com>
Signed-off-by: default avatarJakob Koschel <jakobkoschel@gmail.com>
Link: https://lore.kernel.org/r/20220127144406.3589293-2-jakobkoschel@gmail.com


Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61cc70d9

drivers/tty/vt/vt_ioctl.c

+1 −0
Original line number Diff line number Diff line
@@ -845,6 +845,7 @@ int vt_ioctl(struct tty_struct *tty, 
			return -ENXIO;



		arg--;

		arg = array_index_nospec(arg, MAX_NR_CONSOLES);

		console_lock();

		ret = vc_allocate(arg);

		console_unlock();