[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/12] qga: handle possible SIGPIPE in guest-file-wr
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 10/12] qga: handle possible SIGPIPE in guest-file-write |
Date: |
Wed, 14 Oct 2015 15:08:03 -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 32646dc..5794c0d 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -214,6 +214,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,
@@ -239,7 +255,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
- Re: [Qemu-devel] [PATCH 09/12] qga: guest exec functionality, (continued)
- [Qemu-devel] [PATCH 12/12] qga: guest-exec simple stdin/stdout/stderr redirection, Michael Roth, 2015/10/14
- [Qemu-devel] [PATCH 03/12] qga: add QGA_CONF environment variable, Michael Roth, 2015/10/14
- [Qemu-devel] [PATCH 05/12] qtest: add a few fd-level qmp helpers, Michael Roth, 2015/10/14
- [Qemu-devel] [PATCH 04/12] qga: do not override configuration verbosity, Michael Roth, 2015/10/14
- [Qemu-devel] [PATCH 06/12] glib-compat: add 2.38/2.40/2.46 asserts, Michael Roth, 2015/10/14
- [Qemu-devel] [PATCH 08/12] qga: drop guest_file_init helper and replace it with static initializers, Michael Roth, 2015/10/14
- [Qemu-devel] [PATCH 11/12] qga: handle G_IO_STATUS_AGAIN in ga_channel_write_all(), Michael Roth, 2015/10/14
- [Qemu-devel] [PATCH 01/12] build: qemu-ga: add 'qemu-ga' build target for w32, Michael Roth, 2015/10/14
- [Qemu-devel] [PATCH 10/12] qga: handle possible SIGPIPE in guest-file-write,
Michael Roth <=
- [Qemu-devel] [PATCH 07/12] tests: add a local test for guest agent, Michael Roth, 2015/10/15