diff --git a/spice-vdagent.changes b/spice-vdagent.changes index 3a3761e..4f7d680 100644 --- a/spice-vdagent.changes +++ b/spice-vdagent.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 26 15:33:15 UTC 2020 - Bruce Rogers + +- Fix issue of spice-vdagentd not shutting down (bsc#1166895) + vdagentd-work-around-GLib-s-fork-issues.patch + (This patch fixes a related issue) + vdagentd-init-static-uinput-before-fork.patch + ------------------------------------------------------------------- Tue Mar 10 21:19:18 UTC 2020 - Bruce Rogers diff --git a/spice-vdagent.spec b/spice-vdagent.spec index 69fe523..b1d73ae 100644 --- a/spice-vdagent.spec +++ b/spice-vdagent.spec @@ -27,6 +27,8 @@ URL: http://spice-space.org/ Source: http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2 Source1: http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2.sig Source2: %{name}.keyring +Patch1: vdagentd-work-around-GLib-s-fork-issues.patch +Patch2: vdagentd-init-static-uinput-before-fork.patch BuildRequires: alsa-devel >= 1.0.22 BuildRequires: desktop-file-utils BuildRequires: libXfixes-devel @@ -61,6 +63,8 @@ Features: %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build %configure \ diff --git a/vdagentd-init-static-uinput-before-fork.patch b/vdagentd-init-static-uinput-before-fork.patch new file mode 100644 index 0000000..0596c3d --- /dev/null +++ b/vdagentd-init-static-uinput-before-fork.patch @@ -0,0 +1,46 @@ +From 7b0435ef66af088c1a1be20b6bc6b0fcb76e4e1a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20Jank=C5=AF?= +Date: Fri, 20 Mar 2020 17:18:32 +0100 +Subject: [PATCH] vdagentd: init static uinput before fork +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise the caller doesn't know that the init failed +because we're returning 0 in the parent and 1 in child. + +Signed-off-by: Jakub Janků +Acked-by: Frediano Ziglio +[BR: BSC#1166895] +Signed-off-by: Bruce Rogers +--- + src/vdagentd/vdagentd.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c +index 1b63ec8..753c9bf 100644 +--- a/src/vdagentd/vdagentd.c ++++ b/src/vdagentd/vdagentd.c +@@ -1224,9 +1224,6 @@ int main(int argc, char *argv[]) + } + } + +- if (do_daemonize) +- daemonize(); +- + #ifdef WITH_STATIC_UINPUT + uinput = vdagentd_uinput_create(uinput_device, 1024, 768, NULL, 0, + debug > 1, uinput_fake); +@@ -1236,6 +1233,9 @@ int main(int argc, char *argv[]) + } + #endif + ++ if (do_daemonize) ++ daemonize(); ++ + g_unix_signal_add(SIGINT, signal_handler, NULL); + g_unix_signal_add(SIGHUP, signal_handler, NULL); + g_unix_signal_add(SIGTERM, signal_handler, NULL); +-- +2.25.1 + diff --git a/vdagentd-work-around-GLib-s-fork-issues.patch b/vdagentd-work-around-GLib-s-fork-issues.patch new file mode 100644 index 0000000..bac3174 --- /dev/null +++ b/vdagentd-work-around-GLib-s-fork-issues.patch @@ -0,0 +1,105 @@ +From 9b8c0ebb9fb573e6ce3c5416371509f416503d0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jakub=20Jank=C5=AF?= +Date: Fri, 20 Mar 2020 10:36:03 +0100 +Subject: [PATCH] vdagentd: work around GLib's fork issues +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Creating threads is not compatible with forking as only the thread +that calls fork() is inherited. + +Handlers registered with g_unix_signal_add() create a thread so +move these calls after fork. + +Also call g_socket_service_start() after fork to avoid creation of +new threads before it is necessary. + +Fixes: https://gitlab.freedesktop.org/spice/linux/vd_agent/issues/18 + +Also see: https://gitlab.gnome.org/GNOME/glib/issues/2073 + +Signed-off-by: Jakub Janků +Acked-by: Frediano Ziglio +[BR: BSC#1166895] +Signed-off-by: Bruce Rogers +--- + src/udscs.c | 6 ++++++ + src/udscs.h | 2 ++ + src/vdagentd/vdagentd.c | 9 +++++---- + 3 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/src/udscs.c b/src/udscs.c +index 4de75f8..7c99eed 100644 +--- a/src/udscs.c ++++ b/src/udscs.c +@@ -186,6 +186,7 @@ struct udscs_server *udscs_server_new( + server->read_callback = read_callback; + server->error_cb = error_cb; + server->service = g_socket_service_new(); ++ g_socket_service_stop(server->service); + + g_signal_connect(server->service, "incoming", + G_CALLBACK(udscs_server_accept_cb), server); +@@ -223,6 +224,11 @@ void udscs_server_listen_to_address(struct udscs_server *server, + g_object_unref(sock_addr); + } + ++void udscs_server_start(struct udscs_server *server) ++{ ++ g_socket_service_start(server->service); ++} ++ + void udscs_server_destroy_connection(struct udscs_server *server, + UdscsConnection *conn) + { +diff --git a/src/udscs.h b/src/udscs.h +index 45ebd3f..4f7ea36 100644 +--- a/src/udscs.h ++++ b/src/udscs.h +@@ -98,6 +98,8 @@ void udscs_server_listen_to_address(struct udscs_server *server, + const gchar *addr, + GError **err); + ++void udscs_server_start(struct udscs_server *server); ++ + void udscs_server_destroy_connection(struct udscs_server *server, + UdscsConnection *conn); + +diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c +index cfd0a51..1b63ec8 100644 +--- a/src/vdagentd/vdagentd.c ++++ b/src/vdagentd/vdagentd.c +@@ -1184,10 +1184,6 @@ int main(int argc, char *argv[]) + uinput_device = g_strdup(DEFAULT_UINPUT_DEVICE); + } + +- g_unix_signal_add(SIGINT, signal_handler, NULL); +- g_unix_signal_add(SIGHUP, signal_handler, NULL); +- g_unix_signal_add(SIGTERM, signal_handler, NULL); +- + openlog("spice-vdagentd", do_daemonize ? 0 : LOG_PERROR, LOG_USER); + + /* Setup communication with vdagent process(es) */ +@@ -1240,6 +1236,10 @@ int main(int argc, char *argv[]) + } + #endif + ++ g_unix_signal_add(SIGINT, signal_handler, NULL); ++ g_unix_signal_add(SIGHUP, signal_handler, NULL); ++ g_unix_signal_add(SIGTERM, signal_handler, NULL); ++ + if (want_session_info) + session_info = session_info_create(debug); + if (session_info) { +@@ -1252,6 +1252,7 @@ int main(int argc, char *argv[]) + + active_xfers = g_hash_table_new(g_direct_hash, g_direct_equal); + ++ udscs_server_start(server); + loop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(loop); + +-- +2.25.1 +