From 13a43c73d8cbac4b65472de04bb88ea1bacdeb89 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 24 Apr 2019 17:24:02 +0200 Subject: Add check to switch VTs only between K_XLATE or K_UNICODE Switching to K_UNICODE from other than L_XLATE can make the keyboard unusable and possibly leak keypresses from X. BugLink: https://launchpad.net/bugs/1803993 --- src/vconsole/vconsole-setup.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/vconsole/vconsole-setup.c') diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 1feb8d9370..140e0badd2 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -76,6 +76,13 @@ static int toggle_utf8(const char *name, int fd, bool utf8) { assert(name); + r = vt_verify_kbmode(fd); + if (r == -EBUSY) { + log_warning_errno(r, "Virtual console %s is not in K_XLATE or K_UNICODE: %m", name); + return 0; + } else if (r < 0) + return log_warning_errno(r, "Failed to verify kbdmode on %s: %m", name); + r = ioctl(fd, KDSKBMODE, utf8 ? K_UNICODE : K_XLATE); if (r < 0) return log_warning_errno(errno, "Failed to %s UTF-8 kbdmode on %s: %m", enable_disable(utf8), name); -- cgit v1.2.1