From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9sjS-0001I3-8f for qemu-devel@nongnu.org; Tue, 30 Jun 2015 06:25:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9sjQ-0007GK-I8 for qemu-devel@nongnu.org; Tue, 30 Jun 2015 06:25:38 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:7395 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9sjQ-0007G2-2j for qemu-devel@nongnu.org; Tue, 30 Jun 2015 06:25:36 -0400 From: "Denis V. Lunev" Date: Tue, 30 Jun 2015 13:25:17 +0300 Message-Id: <1435659923-2211-5-git-send-email-den@openvz.org> In-Reply-To: <1435659923-2211-1-git-send-email-den@openvz.org> References: <1435659923-2211-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 04/10] qga: handle possible SIGPIPE in guest-file-write List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Roth , Olga Krishtal , qemu-devel@nongnu.org, "Denis V. Lunev" From: Olga Krishtal 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: Olga Krishtal Acked-by: Roman Kagan Signed-off-by: Denis V. Lunev CC: Eric Blake CC: Michael Roth --- qga/commands-posix.c | 16 ++++++++++++++++ qga/main.c | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 81701b5..b1478bf 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -958,6 +958,20 @@ static int guest_exec_set_std(GuestFileHandle *gfh, int std_fd, int fd_null) return 0; } +/** Reset ignored signals back to default. */ +static void guest_exec_reset_child_sig(void) +{ + 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)); + } +} + GuestExec *qmp_guest_exec(const char *path, bool has_params, strList *params, bool has_env, strList *env, @@ -1029,6 +1043,8 @@ GuestExec *qmp_guest_exec(const char *path, /* exit(1); */ } + guest_exec_reset_child_sig(); + execvpe(path, (char * const *)argv, (char * const *)envp); slog("guest-exec child failed: %s", strerror(errno)); exit(1); diff --git a/qga/main.c b/qga/main.c index 23cde01..a2ed460 100644 --- a/qga/main.c +++ b/qga/main.c @@ -160,6 +160,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; } -- 2.1.4