VT kbd reset check #12378

rbalint · 2019-04-24T17:52:23Z

No description provided.

setharnold · 2019-04-25T00:07:07Z

Is it ever okay for vt_reset_keyboard() or toggle_utf8() to run without checking vt_verify_kbmode() first? Should this call be moved into these two functions rather than into all the call sites?

Thanks

rbalint · 2019-04-25T08:55:44Z

@setharnold I felt the code more descriptive having the checks and the actions separately rather than moving the extra checks to the actions. Also I did not add extra logging, because it is normal to have VTs in raw mode.
I can imagine that we may call vt_reset_keyboard() when the keyboard is really in the bad state, but did not find such scenario myself.

poettering

looks good, just some nitpicks

src/basic/terminal-util.c

poettering · 2019-04-29T19:43:46Z

i think i agree with @setharnold though: if those checks are pre-condition to these operations they probably should move into the callee, not the caller. Encapsulation and terseness is nice, and the caller shouldn't need to know about that

rbalint · 2019-04-30T10:16:20Z

@setharnold @poettering OK, made the requested changes.

poettering

Also, CI doesn't pass. Please always build and test before pushing. Thanks!

src/basic/terminal-util.c

src/vconsole/vconsole-setup.c

rbalint · 2019-05-14T10:38:32Z

@poettering Would you like to see something else to be changed?

poettering

looks pretty good, just some nitpcks

poettering · 2019-05-14T14:17:49Z

src/basic/terminal-util.c

+        r = vt_verify_kbmode(fd);
+        if (r < 0) {
+                if (r == -EBUSY) {
+                        log_debug_errno(-r, "Keyboard is not in XLATE or UNICODE mode, not resetting: %m");


no need to negate "r". log_debug_errno() (and its friends) generally do that internally if necessary.

Let's keep the indentation level small here, hence maybe write as:

if (r == -EBUSY) { … } else if (r < 0) return r;

poettering · 2019-05-14T14:18:05Z

src/vconsole/vconsole-setup.c

+        r = vt_verify_kbmode(fd);
+        if (r < 0) {
+                if (r == -EBUSY) {
+                        log_debug_errno(-r, "Virtual console %s is not in K_XLATE or K_UNICODE: %m", name);


as above, no negation necessary

poettering · 2019-05-14T14:18:11Z

src/vconsole/vconsole-setup.c

+                        log_debug_errno(-r, "Virtual console %s is not in K_XLATE or K_UNICODE: %m", name);
+                        return 0;
+                } else
+                        return log_debug_errno(-r, "Failed to verify kbdmode on %s: %m", name);


poettering · 2019-05-14T14:18:26Z

src/vconsole/vconsole-setup.c

+                        return 0;
+                } else
+                        return log_debug_errno(-r, "Failed to verify kbdmode on %s: %m", name);
+        }


and similar to above: small indentation levels are cool!

poettering · 2019-05-15T08:48:12Z

src/vconsole/vconsole-setup.c

+                log_debug_errno(r, "Virtual console %s is not in K_XLATE or K_UNICODE: %m", name);
+                return 0;
+        } else if (r < 0)
+                return log_debug_errno(r, "Failed to verify kbdmode on %s: %m", name);


all other failure codepaths in this functions log loudly, this one should hence too, i.e. bump this one line from log_debug_errno() to log_warning_errno()

poettering

(btw, please always add a quick comment when you push a new version. For some reason github doesn't always notify us about pushes)

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

rbalint · 2019-05-16T14:36:08Z

@poettering I see bionic autopkgtests failing for other PR-s, too, and I ran autopkgtest successfully when I cherry-picked the change to Disco, thus I believe the failing tests are not related to this commit.

jackpot51 · 2019-05-16T16:36:23Z

🎉

setharnold · 2019-05-17T18:40:39Z

Thanks everyone for working on this!

Use CVE-2018-20839.

Thanks

mbiebl · 2019-05-19T17:41:20Z

@rbalint seems like this has caused a regression.
Could you have a look at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=929229 ?
I've pulled this particular patch into 241-4.

rbalint · 2019-05-21T11:53:44Z

Thanks, the regression is tracked in #12616 .

fbuihuu · 2019-05-22T07:48:43Z

Sorry for coming late but I can't figure out how the initial issue that @rbalint fixed can happen in practice and the commit message of the relevant commit doesn't really help...

In my understanding logind resets the keyboard to K_UNICODE only when it has to acknowledge the VT-switch signal itself for a terminal which has no controlling process.

@rbalint did you manage to reproduce the issue ? If so can you tell how exactly ?

I'm asking because I can't here.

jsoref · 2019-05-29T00:34:36Z

fwiw, github never notifies for force-pushes. Even though it's well aware of them. People can complain to github support and maybe they'll eventually fix it.

Revert of #12378 ("VT kbd reset check")

Move verify_vc_kbmode() to terminal-util.c as vt_verify_kbmode()

bb5ac84

poettering requested changes Apr 29, 2019

View reviewed changes

src/basic/terminal-util.c Outdated Show resolved Hide resolved

src/basic/terminal-util.c Outdated Show resolved Hide resolved

poettering added login reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks util-lib vconsole labels Apr 30, 2019

rbalint force-pushed the vt-kbd-reset-check branch from 0e15bbe to 4368327 Compare April 30, 2019 10:14

poettering requested changes Apr 30, 2019

View reviewed changes

src/basic/terminal-util.c Show resolved Hide resolved

src/vconsole/vconsole-setup.c Outdated Show resolved Hide resolved

rbalint force-pushed the vt-kbd-reset-check branch from 4368327 to 9a03a4e Compare April 30, 2019 13:48

rbalint changed the title ~~VT kbd reset check~~ WIP: VT kbd reset check Apr 30, 2019

rbalint force-pushed the vt-kbd-reset-check branch from 9a03a4e to 6b7da9d Compare April 30, 2019 20:12

rbalint changed the title ~~WIP: VT kbd reset check~~ VT kbd reset check Apr 30, 2019

poettering requested changes May 14, 2019

View reviewed changes

poettering added this to the v243 milestone May 14, 2019

rbalint force-pushed the vt-kbd-reset-check branch from 6b7da9d to 9a932dd Compare May 14, 2019 21:44

poettering reviewed May 15, 2019

View reviewed changes

poettering requested changes May 15, 2019

View reviewed changes

rbalint force-pushed the vt-kbd-reset-check branch 2 times, most recently from e7e5b3e to de564ef Compare May 15, 2019 14:29

Add check to switch VTs only between K_XLATE or K_UNICODE

13a43c7

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

rbalint force-pushed the vt-kbd-reset-check branch from de564ef to 13a43c7 Compare May 15, 2019 20:29

poettering merged commit 9725f1a into systemd:master May 16, 2019

mbiebl mentioned this pull request May 19, 2019

keyboard freezes after exiting X #12616

Closed

keszybz removed the reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks label May 22, 2019

fbuihuu mentioned this pull request Jul 19, 2019

Revert of #12378 ("VT kbd reset check") #13109

Merged

poettering added a commit that referenced this pull request Jul 23, 2019

Merge pull request #13109 from poettering/revert-kbd-mode

ad3f86e

Revert of #12378 ("VT kbd reset check")

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

VT kbd reset check #12378

VT kbd reset check #12378

rbalint commented Apr 24, 2019

setharnold commented Apr 25, 2019

rbalint commented Apr 25, 2019

poettering left a comment

poettering commented Apr 29, 2019

rbalint commented Apr 30, 2019

poettering left a comment

rbalint commented May 14, 2019

poettering left a comment

poettering May 14, 2019

poettering May 14, 2019

poettering May 14, 2019

poettering May 14, 2019

poettering May 15, 2019

poettering left a comment

rbalint commented May 16, 2019

jackpot51 commented May 16, 2019

setharnold commented May 17, 2019

mbiebl commented May 19, 2019

rbalint commented May 21, 2019

fbuihuu commented May 22, 2019

jsoref commented May 29, 2019

VT kbd reset check #12378

VT kbd reset check #12378

Conversation

rbalint commented Apr 24, 2019

setharnold commented Apr 25, 2019

rbalint commented Apr 25, 2019

poettering left a comment

Choose a reason for hiding this comment

poettering commented Apr 29, 2019

rbalint commented Apr 30, 2019

poettering left a comment

Choose a reason for hiding this comment

rbalint commented May 14, 2019

poettering left a comment

Choose a reason for hiding this comment

poettering May 14, 2019

Choose a reason for hiding this comment

poettering May 14, 2019

Choose a reason for hiding this comment

poettering May 14, 2019

Choose a reason for hiding this comment

poettering May 14, 2019

Choose a reason for hiding this comment

poettering May 15, 2019

Choose a reason for hiding this comment

poettering left a comment

Choose a reason for hiding this comment

rbalint commented May 16, 2019

jackpot51 commented May 16, 2019

setharnold commented May 17, 2019

mbiebl commented May 19, 2019

rbalint commented May 21, 2019

fbuihuu commented May 22, 2019

jsoref commented May 29, 2019