[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 10/13] qga: handle possible SIGPIPE in guest-file-
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PULL v3 10/13] qga: handle possible SIGPIPE in guest-file-write |
Date: |
Sat, 17 Oct 2015 11:59:17 -0500 |
From: "Denis V. Lunev" <address@hidden>
qemu-ga should not exit on guest-file-write to pipe without read end
but proper error code should be returned. The behavior of the
spawned process should be default thus SIGPIPE processing should be
reset to default after fork() but before exec().
Signed-off-by: Denis V. Lunev <address@hidden>
Signed-off-by: Yuri Pudgorodskiy <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
qga/commands.c | 18 +++++++++++++++++-
qga/main.c | 6 ++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/qga/commands.c b/qga/commands.c
index ced72d5..68e8cfa 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -225,6 +225,22 @@ static void guest_exec_child_watch(GPid pid, gint status,
gpointer data)
g_spawn_close_pid(pid);
}
+/** Reset ignored signals back to default. */
+static void guest_exec_task_setup(gpointer data)
+{
+#if !defined(G_OS_WIN32)
+ struct sigaction sigact;
+
+ memset(&sigact, 0, sizeof(struct sigaction));
+ sigact.sa_handler = SIG_DFL;
+
+ if (sigaction(SIGPIPE, &sigact, NULL) != 0) {
+ slog("sigaction() failed to reset child process's SIGPIPE: %s",
+ strerror(errno));
+ }
+#endif
+}
+
GuestExec *qmp_guest_exec(const char *path,
bool has_arg, strList *arg,
bool has_env, strList *env,
@@ -250,7 +266,7 @@ GuestExec *qmp_guest_exec(const char *path,
G_SPAWN_SEARCH_PATH |
G_SPAWN_DO_NOT_REAP_CHILD |
G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
- NULL, NULL, &pid, NULL, NULL, NULL, &gerr);
+ guest_exec_task_setup, NULL, &pid, NULL, NULL, NULL, &gerr);
if (!ret) {
error_setg(err, QERR_QGA_COMMAND_FAILED, gerr->message);
g_error_free(gerr);
diff --git a/qga/main.c b/qga/main.c
index aa6a063..068169f 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -161,6 +161,12 @@ static gboolean register_signal_handlers(void)
g_error("error configuring signal handler: %s", strerror(errno));
}
+ sigact.sa_handler = SIG_IGN;
+ if (sigaction(SIGPIPE, &sigact, NULL) != 0) {
+ g_error("error configuring SIGPIPE signal handler: %s",
+ strerror(errno));
+ }
+
return true;
}
--
1.9.1
- [Qemu-devel] [PULL v3 00/13] qemu-ga patch queue, Michael Roth, 2015/10/17
- [Qemu-devel] [PULL v3 10/13] qga: handle possible SIGPIPE in guest-file-write,
Michael Roth <=
- [Qemu-devel] [PULL v3 11/13] qga: handle G_IO_STATUS_AGAIN in ga_channel_write_all(), Michael Roth, 2015/10/17
- [Qemu-devel] [PULL v3 13/13] qga: fix uninitialized value warning for win32, Michael Roth, 2015/10/17
- [Qemu-devel] [PULL v3 12/13] qga: guest-exec simple stdin/stdout/stderr redirection, Michael Roth, 2015/10/17
- [Qemu-devel] [PULL v3 09/13] qga: guest exec functionality, Michael Roth, 2015/10/17
- [Qemu-devel] [PULL v3 02/13] qga: Use g_new() & friends where that makes obvious sense, Michael Roth, 2015/10/17
- [Qemu-devel] [PULL v3 05/13] qtest: add a few fd-level qmp helpers, Michael Roth, 2015/10/17
- [Qemu-devel] [PULL v3 06/13] glib-compat: add 2.38/2.40/2.46 asserts, Michael Roth, 2015/10/17
- [Qemu-devel] [PULL v3 03/13] qga: add QGA_CONF environment variable, Michael Roth, 2015/10/17
- [Qemu-devel] [PULL v3 01/13] build: qemu-ga: add 'qemu-ga' build target for w32, Michael Roth, 2015/10/17
- [Qemu-devel] [PULL v3 04/13] qga: do not override configuration verbosity, Michael Roth, 2015/10/17