Attachment 821945 Details for Bug 1140081

[patch] Patch that tries to restore VT twice

0001-logind-attempt-to-fix-bsc-1140081-issue-13241.patch (text/plain), 2.08 KB, created by Franck Bui on 2019-10-18 15:50:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franck Bui

Created: 2019-10-18 15:50:24 UTC

Size: 2.08 KB

patch

obsolete

>From 4ea5aef41e6412a2ca66f0cd71c72d24483f4408 Mon Sep 17 00:00:00 2001
>From: Franck Bui <fbui@suse.com>
>Date: Fri, 18 Oct 2019 12:44:51 +0200
>Subject: [PATCH] logind: attempt to fix bsc#1140081/issue#13241
>
>---
> src/login/logind-session.c | 34 +++++++++++++++++++++-------------
> 1 file changed, 21 insertions(+), 13 deletions(-)
>
>diff --git a/src/login/logind-session.c b/src/login/logind-session.c
>index 7e8025a0ea..2eea72fb4a 100644
>--- a/src/login/logind-session.c
>+++ b/src/login/logind-session.c
>@@ -1240,23 +1240,31 @@ error:
> }
> 
> static void session_restore_vt(Session *s) {
>-        int r, vt, old_fd;
>+        int r;
> 
>-        /* 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.
>-         */
>-        old_fd = TAKE_FD(s->vtfd);
>+        r = vt_restore(s->vtfd);
>+        if (r == -EIO) {
>+                int vt, old_fd;
> 
>-        vt = session_open_vt(s);
>-        safe_close(old_fd);
>+log_error("FOO: First attempt to restore VT failed, retrying a 2nd time with a fresh handle");
> 
>-        if (vt < 0)
>-                return;
>+                /* It Might happen if the controlling process exited before we
>+                 * finished restoring vt completely and would leave the old
>+                 * file-descriptor potentially in a hung-up state. In this case
>+                 * let's retry with a fresh handle to the virtual terminal.
>+                 *
>+                 * We do a little dance to avoid having the terminal be
>+                 * available for reuse before we've cleaned it up. */
>+
>+                old_fd = TAKE_FD(s->vtfd);
>+
>+                vt = session_open_vt(s);
>+                safe_close(old_fd);
>+
>+                if (vt >= 0)
>+                        r = vt_restore(vt);
>+        }
> 
>-        r = vt_restore(vt);
>         if (r < 0)
>                 log_warning_errno(r, "Failed to restore VT, ignoring: %m");
> 
>-- 
>2.16.4
>

Actions: View | Diff

Attachments on bug 1140081: 821945