From patchwork Tue May 15 14:48:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 159371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1250DB6FA5 for ; Wed, 16 May 2012 01:53:54 +1000 (EST) Received: from localhost ([::1]:33505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJ57-0002VK-PL for incoming@patchwork.ozlabs.org; Tue, 15 May 2012 10:50:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJ4R-0001CI-4C for qemu-devel@nongnu.org; Tue, 15 May 2012 10:49:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUJ4O-00032Y-Qo for qemu-devel@nongnu.org; Tue, 15 May 2012 10:49:50 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:43493) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUJ4O-0002vv-KX for qemu-devel@nongnu.org; Tue, 15 May 2012 10:49:48 -0400 Received: by mail-yx0-f173.google.com with SMTP id m4so6939514yen.4 for ; Tue, 15 May 2012 07:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=CmK62fFLOWhjaBRgYPUAKgO7G3v6UwtUtkXAF0Ez1PU=; b=dRQ7jFm+Kq8PDlAh4klZJwa34VeTgt+w2t0/KZMMbW7mPsV9ySuYCC5nrVLgqkrlD4 wz9f+j+TbGfhr+CJvsyLv5OTzekJTeAb/lifuTVcMnwtCs/nUuB5tZuYQ5dKvEFI8YkL hCGaTPUvXFRz16RaQNSeNFXvLqN5eWofk34dKPgiieJCHG1OUP8MUOOMIyoUW2+YYU/C 0yMbBVeEIptn7ggTpkpPQQZ/U6lwVCIBMfqs4qZ/pHv/EZCfg35n7RhfVGnJnJaVkvNc MhbIGb8kHsHfN5fhloVMxWsF7wx3VAGoyqZIlXchfdouMX9qxSd6m42jgmHzeV4bTC3i 0XAA== Received: by 10.60.3.6 with SMTP id 6mr1620252oey.35.1337093387708; Tue, 15 May 2012 07:49:47 -0700 (PDT) Received: from localhost.localdomain ([32.97.110.59]) by mx.google.com with ESMTPS id a6sm22978806obo.10.2012.05.15.07.49.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 May 2012 07:49:46 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 15 May 2012 09:48:57 -0500 Message-Id: <1337093339-10786-12-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1337093339-10786-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1337093339-10786-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.213.173 Cc: mprivozn@redhat.com, aliguori@us.ibm.com, eblake@redhat.com, jcody@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 11/13] qemu-ga: guest-shutdown: use only async-signal-safe functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Luiz Capitulino POSIX mandates[1] that a child process of a multi-thread program uses only async-signal-safe functions before exec(). We consider qemu-ga to be multi-thread, because it uses glib. However, qmp_guest_shutdown() uses functions that are not async-signal-safe. Fix it the following way: - fclose() -> reopen_fd_to_null() - execl() -> execle() - exit() -> _exit() - drop slog() usage (which is not safe) [1] http://pubs.opengroup.org/onlinepubs/009695399/functions/fork.html Signed-off-by: Luiz Capitulino Reviewed-by: Eric Blake Signed-off-by: Michael Roth --- qapi-schema-guest.json | 3 +-- qga/commands-posix.c | 17 +++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/qapi-schema-guest.json b/qapi-schema-guest.json index 7c6cb21..d4055d2 100644 --- a/qapi-schema-guest.json +++ b/qapi-schema-guest.json @@ -126,8 +126,7 @@ # @guest-shutdown: # # Initiate guest-activated shutdown. Note: this is an asynchronous -# shutdown request, with no guaruntee of successful shutdown. Errors -# will be logged to guest's syslog. +# shutdown request, with no guarantee of successful shutdown. # # @mode: #optional "halt", "powerdown" (default), or "reboot" # diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 68da71f..7664be1 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -37,8 +37,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **err) { const char *shutdown_flag; - int ret, status; pid_t rpid, pid; + int status; slog("guest-shutdown called, mode: %s", mode); if (!has_mode || strcmp(mode, "powerdown") == 0) { @@ -57,16 +57,13 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **err) if (pid == 0) { /* child, start the shutdown */ setsid(); - fclose(stdin); - fclose(stdout); - fclose(stderr); - - ret = execl("/sbin/shutdown", "shutdown", shutdown_flag, "+0", - "hypervisor initiated shutdown", (char*)NULL); - if (ret) { - slog("guest-shutdown failed: %s", strerror(errno)); - } - exit(!!ret); + reopen_fd_to_null(0); + reopen_fd_to_null(1); + reopen_fd_to_null(2); + + execle("/sbin/shutdown", "shutdown", shutdown_flag, "+0", + "hypervisor initiated shutdown", (char*)NULL, environ); + _exit(EXIT_FAILURE); } else if (pid < 0) { goto exit_err; }