logind: get a fresh file descriptor to clean up a VT

[elogind.git] / src / login / logind-session.c

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index e9b179067c51a21e0dd663d4901995323fd897b6..1a5c76b815f4811a12e995fe89778a6e1fed4c3f 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -37,6 +37,8 @@
 #include "bus-util.h"
 #include "bus-error.h"
 #include "logind-session.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "logind-session.h"

+#include "formats-util.h"
+#include "terminal-util.h"

 
 #define RELEASE_USEC (20*USEC_PER_SEC)
 
 
 #define RELEASE_USEC (20*USEC_PER_SEC)
 


@@ -262,7 +264,7 @@ int session_save(Session *s) {
                 fprintf(f, "VTNR=%u\n", s->vtnr);
 
         if (!s->vtnr)
                 fprintf(f, "VTNR=%u\n", s->vtnr);
 
         if (!s->vtnr)

-                fprintf(f, "POS=%u\n", s->pos);
+                fprintf(f, "POSITION=%u\n", s->position);

 
         if (s->leader > 0)
                 fprintf(f, "LEADER="PID_FMT"\n", s->leader);
 
         if (s->leader > 0)
                 fprintf(f, "LEADER="PID_FMT"\n", s->leader);


@@ -300,7 +302,7 @@ int session_load(Session *s) {
                 *seat = NULL,
                 *vtnr = NULL,
                 *state = NULL,
                 *seat = NULL,
                 *vtnr = NULL,
                 *state = NULL,

-                *pos = NULL,
+                *position = NULL,

                 *leader = NULL,
                 *type = NULL,
                 *class = NULL,
                 *leader = NULL,
                 *type = NULL,
                 *class = NULL,


@@ -327,7 +329,7 @@ int session_load(Session *s) {
                            "DESKTOP",        &s->desktop,
                            "VTNR",           &vtnr,
                            "STATE",          &state,
                            "DESKTOP",        &s->desktop,
                            "VTNR",           &vtnr,
                            "STATE",          &state,

-                           "POS",            &pos,
+                           "POSITION",       &position,

                            "LEADER",         &leader,
                            "TYPE",           &type,
                            "CLASS",          &class,
                            "LEADER",         &leader,
                            "TYPE",           &type,
                            "CLASS",          &class,


@@ -386,10 +388,10 @@ int session_load(Session *s) {
         if (!s->seat || !seat_has_vts(s->seat))
                 s->vtnr = 0;
 
         if (!s->seat || !seat_has_vts(s->seat))
                 s->vtnr = 0;
 

-        if (pos && s->seat) {
+        if (position && s->seat) {

                 unsigned int npos;
 
                 unsigned int npos;
 

-                safe_atou(pos, &npos);
+                safe_atou(position, &npos);

                 seat_claim_position(s->seat, s, npos);
         }
 
                 seat_claim_position(s->seat, s, npos);
         }
 


@@ -628,6 +630,9 @@ int session_stop(Session *s, bool force) {
 
         s->timer_event_source = sd_event_source_unref(s->timer_event_source);
 
 
         s->timer_event_source = sd_event_source_unref(s->timer_event_source);
 

+        if (s->seat)
+                seat_evict_position(s->seat, s);
+

         /* We are going down, don't care about FIFOs anymore */
         session_remove_fifo(s);
 
         /* We are going down, don't care about FIFOs anymore */
         session_remove_fifo(s);
 


@@ -664,6 +669,9 @@ int session_finalize(Session *s) {
 
         s->timer_event_source = sd_event_source_unref(s->timer_event_source);
 
 
         s->timer_event_source = sd_event_source_unref(s->timer_event_source);
 

+        if (s->seat)
+                seat_evict_position(s->seat, s);
+

         /* Kill session devices */
         while ((sd = hashmap_first(s->devices)))
                 session_device_free(sd);
         /* Kill session devices */
         while ((sd = hashmap_first(s->devices)))
                 session_device_free(sd);


@@ -701,18 +709,20 @@ static int release_timeout_callback(sd_event_source *es, uint64_t usec, void *us
         return 0;
 }
 
         return 0;
 }
 

-void session_release(Session *s) {
+int session_release(Session *s) {

         assert(s);
 
         if (!s->started || s->stopping)
         assert(s);
 
         if (!s->started || s->stopping)

-                return;
+                return 0;
+
+        if (s->timer_event_source)
+                return 0;

 
 

-        if (!s->timer_event_source)
-                sd_event_add_time(s->manager->event,
-                                  &s->timer_event_source,
-                                  CLOCK_MONOTONIC,
-                                  now(CLOCK_MONOTONIC) + RELEASE_USEC, 0,
-                                  release_timeout_callback, s);
+        return sd_event_add_time(s->manager->event,
+                                 &s->timer_event_source,
+                                 CLOCK_MONOTONIC,
+                                 now(CLOCK_MONOTONIC) + RELEASE_USEC, 0,
+                                 release_timeout_callback, s);

 }
 
 bool session_is_active(Session *s) {
 }
 
 bool session_is_active(Session *s) {


@@ -971,7 +981,7 @@ static int session_open_vt(Session *s) {
                 return s->vtfd;
 
         sprintf(path, "/dev/tty%u", s->vtnr);
                 return s->vtfd;
 
         sprintf(path, "/dev/tty%u", s->vtnr);

-        s->vtfd = open(path, O_RDWR | O_CLOEXEC | O_NONBLOCK | O_NOCTTY);
+        s->vtfd = open_terminal(path, O_RDWR | O_CLOEXEC | O_NONBLOCK | O_NOCTTY);

         if (s->vtfd < 0)
                 return log_error_errno(errno, "cannot open VT %s of session %s: %m", path, s->id);
 
         if (s->vtfd < 0)
                 return log_error_errno(errno, "cannot open VT %s of session %s: %m", path, s->id);
 


@@ -1035,19 +1045,30 @@ void session_restore_vt(Session *s) {
         int vt, kb = K_XLATE;
         struct vt_mode mode = { 0 };
 
         int vt, kb = K_XLATE;
         struct vt_mode mode = { 0 };
 

+        /* We need to get a fresh handle to the virtual terminal,
+         * since the old file-descriptor is potentially in a hung-up
+         * state after the controlling process exited; we do a
+         * little dance to avoid having the terminal be available
+         * for reuse before we've cleaned it up.
+         */
+        int old_fd = s->vtfd;
+        s->vtfd = -1;
+

         vt = session_open_vt(s);
         vt = session_open_vt(s);

+        safe_close(old_fd);
+

         if (vt < 0)
                 return;
 
         if (vt < 0)
                 return;
 

-        ioctl(vt, KDSETMODE, KD_TEXT);
+        (void) ioctl(vt, KDSETMODE, KD_TEXT);

 
         if (read_one_line_file("/sys/module/vt/parameters/default_utf8", &utf8) >= 0 && *utf8 == '1')
                 kb = K_UNICODE;
 
 
         if (read_one_line_file("/sys/module/vt/parameters/default_utf8", &utf8) >= 0 && *utf8 == '1')
                 kb = K_UNICODE;
 

-        ioctl(vt, KDSKBMODE, kb);
+        (void) ioctl(vt, KDSKBMODE, kb);

 
         mode.mode = VT_AUTO;
 
         mode.mode = VT_AUTO;

-        ioctl(vt, VT_SETMODE, &mode);
+        (void) ioctl(vt, VT_SETMODE, &mode);

 
         fchown(vt, 0, -1);
 
 
         fchown(vt, 0, -1);