SHA256
1
0
forked from pool/systemd
systemd/0004-login-set_controller-should-fail-if-prepare_vt-fails.patch

135 lines
4.2 KiB
Diff
Raw Normal View History

Based on baccf3e40bab6c0b69992ae29c396930de4660c9 Mon Sep 17 00:00:00 2001
From: Olivier Brunel <jjk@jjacky.com>
Date: Fri, 8 Aug 2014 20:45:43 +0200
Subject: [PATCH] login: set_controller should fail if prepare_vt fails
If controllers can expect logind to have "prepared" the VT (e.g. set it to
graphics mode, etc) then TakeControl() should fail if said preparation
failed (and session_restore_vt() was called).
(David: fixed up !CONFIG_VT case and errno-numbers)
---
src/login/logind-session.c | 47 +++++++++++++++++++++++++++++++++------------
src/login/logind-session.h | 2 -
2 files changed, 36 insertions(+), 13 deletions(-)
--- src/login/logind-session.c
+++ src/login/logind-session.c 2014-08-26 10:14:21.014235811 +0000
@@ -950,8 +950,8 @@ int session_kill(Session *s, KillWho who
static int session_open_vt(Session *s) {
char path[sizeof("/dev/tty") + DECIMAL_STR_MAX(s->vtnr)];
- if (!s->vtnr)
- return -1;
+ if (s->vtnr < 1)
+ return -ENODEV;
if (s->vtfd >= 0)
return s->vtfd;
@@ -975,22 +975,38 @@ static int session_vt_fn(sd_event_source
return 0;
}
-void session_mute_vt(Session *s) {
+int session_mute_vt(Session *s) {
int vt, r;
struct vt_mode mode = { 0 };
sigset_t mask;
+ if (s->vtnr < 1)
+ return 0;
+
vt = session_open_vt(s);
if (vt < 0)
- return;
+ return vt;
+
+ r = fchown(vt, s->user->uid, -1);
+ if (r < 0) {
+ r = -errno;
+ log_error("Cannot change owner of /dev/tty%u: %m", s->vtnr);
+ goto error;
+ }
r = ioctl(vt, KDSKBMODE, K_OFF);
- if (r < 0)
+ if (r < 0) {
+ r = -errno;
+ log_error("Cannot set K_OFF on /dev/tty%u: %m", s->vtnr);
goto error;
+ }
r = ioctl(vt, KDSETMODE, KD_GRAPHICS);
- if (r < 0)
+ if (r < 0) {
+ r = -errno;
+ log_error("Cannot set KD_GRAPHICS on /dev/tty%u: %m", s->vtnr);
goto error;
+ }
sigemptyset(&mask);
sigaddset(&mask, SIGUSR1);
@@ -1007,14 +1023,17 @@ void session_mute_vt(Session *s) {
mode.relsig = SIGUSR1;
mode.acqsig = SIGUSR1;
r = ioctl(vt, VT_SETMODE, &mode);
- if (r < 0)
+ if (r < 0) {
+ r = -errno;
+ log_error("Cannot set VT_PROCESS on /dev/tty%u: %m", s->vtnr);
goto error;
+ }
- return;
+ return 0;
error:
- log_error("cannot mute VT %u for session %s (%d/%d)", s->vtnr, s->id, r, errno);
session_restore_vt(s);
+ return r;
}
void session_restore_vt(Session *s) {
@@ -1037,6 +1056,8 @@ void session_restore_vt(Session *s) {
mode.mode = VT_AUTO;
ioctl(vt, VT_SETMODE, &mode);
+ fchown(vt, 0, -1);
+
close_nointr_nofail(vt);
s->vtfd = -1;
}
@@ -1091,8 +1112,6 @@ int session_set_controller(Session *s, c
return r;
}
- session_swap_controller(s, t);
-
/* When setting a session controller, we forcibly mute the VT and set
* it into graphics-mode. Applications can override that by changing
* VT state after calling TakeControl(). However, this serves as a good
@@ -1101,7 +1120,11 @@ int session_set_controller(Session *s, c
* exits.
* If logind crashes/restarts, we restore the controller during restart
* or reset the VT in case it crashed/exited, too. */
- session_mute_vt(s);
+ r = session_mute_vt(s);
+ if (r < 0)
+ return r;
+
+ session_swap_controller(s, t);
return 0;
}
--- src/login/logind-session.h
+++ src/login/logind-session.h 2014-08-25 17:19:29.042236429 +0000
@@ -172,7 +172,7 @@ SessionClass session_class_from_string(c
const char *kill_who_to_string(KillWho k) _const_;
KillWho kill_who_from_string(const char *s) _pure_;
-void session_mute_vt(Session *s);
+int session_mute_vt(Session *s);
void session_restore_vt(Session *s);
bool session_is_controller(Session *s, const char *sender);