diff options
| author | Jakob Koschel <jakobkoschel@gmail.com> | 2022-01-27 15:44:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-16 12:52:52 +0100 |
| commit | 0e31f914d761767c7a15bde4a6f1e55ea74ba09e (patch) | |
| tree | 891992f56bdfc49b71c67b5fec477365e496a812 /drivers/tty/vt/vt_ioctl.c | |
| parent | ae3d57411562260ee3f4fd5e875f410002341104 (diff) | |
| download | linux-stable-0e31f914d761767c7a15bde4a6f1e55ea74ba09e.tar.gz linux-stable-0e31f914d761767c7a15bde4a6f1e55ea74ba09e.tar.bz2 linux-stable-0e31f914d761767c7a15bde4a6f1e55ea74ba09e.zip | |
vt_ioctl: add array_index_nospec to VT_ACTIVATE
commit 28cb138f559f8c1a1395f5564f86b8bbee83631b upstream.
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: Brian Johannesmeyer <bjohannesmeyer@gmail.com>
Signed-off-by: Brian Johannesmeyer <bjohannesmeyer@gmail.com>
Signed-off-by: Jakob 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt/vt_ioctl.c')
| -rw-r--r-- | drivers/tty/vt/vt_ioctl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index 08b6a7d3b1e9..312857168dad 100644 --- a/drivers/tty/vt/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c @@ -691,6 +691,7 @@ int vt_ioctl(struct tty_struct *tty, ret = -ENXIO; else { arg--; + arg = array_index_nospec(arg, MAX_NR_CONSOLES); console_lock(); ret = vc_allocate(arg); console_unlock(); |