From patchwork Mon Jan 14 19:55:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 211889 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 9D8B92C00A3 for ; Tue, 15 Jan 2013 07:35:44 +1100 (EST) Received: from localhost ([::1]:56645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TuqDc-000373-54 for incoming@patchwork.ozlabs.org; Mon, 14 Jan 2013 15:01:16 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TuqCo-0001TR-GM for qemu-devel@nongnu.org; Mon, 14 Jan 2013 15:00:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TuqCe-0008Nn-8d for qemu-devel@nongnu.org; Mon, 14 Jan 2013 15:00:26 -0500 Received: from mail-ie0-f171.google.com ([209.85.223.171]:54223) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TuqCe-0008Mq-4N for qemu-devel@nongnu.org; Mon, 14 Jan 2013 15:00:16 -0500 Received: by mail-ie0-f171.google.com with SMTP id 17so5736710iea.16 for ; Mon, 14 Jan 2013 12:00:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=LgDALVwV2OVogKwOsNTbJxPvrwzjjWXU6vPVzmR0WwU=; b=QRspT9ObOxvaT2gg5nEzzpDqJpQCTOjaFWDw2hO0HHYuO7nQ0/24yMTlpJGm6tRsDg ceLjx/VcXA06xx8AiQwk+akmTR+wJ/o7Wjz+vZ4aGx5VVbKZr4EkHvldQMEMZdJvRdGz Vepi6AW72khLecjbiGDgRwzHXPYDssf/sevQXDvy6khGCJ2skdowppf4EOOZi76NtMi4 JSNlQQaN48eRD5YtE6enORU/7giil6FP+s4+1TSQab3PkiHsqnqBDvTa5sVPS+51Aa1v a63nsK1uZngCwlGfxtj7NzcTFBYUMWFZScJGMWxiMR/Ea51f3j27nCDCI/gF+4FF7Oij z1lQ== X-Received: by 10.42.51.207 with SMTP id f15mr63664693icg.16.1358193613816; Mon, 14 Jan 2013 12:00:13 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id j11sm141046igc.5.2013.01.14.12.00.10 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 14 Jan 2013 12:00:13 -0800 (PST) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 14 Jan 2013 13:55:06 -0600 Message-Id: <1358193312-15960-3-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358193312-15960-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1358193312-15960-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.223.171 Cc: aliguori@us.ibm.com, armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 2/8] qemu-ga: add ga_open_logfile() 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 This function sets O_CLOEXEC on the log file fd so that it isn't leaked to executed processes. Signed-off-by: Luiz Capitulino Reviewed-by: Eric Blake Acked-by: Amos Kong Tested-by: Amos Kong Signed-off-by: Michael Roth --- qga/main.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/qga/main.c b/qga/main.c index 4239150..bd70ead 100644 --- a/qga/main.c +++ b/qga/main.c @@ -261,6 +261,19 @@ void ga_set_response_delimited(GAState *s) s->delimit_response = true; } +static FILE *ga_open_logfile(const char *logfile) +{ + FILE *f; + + f = fopen(logfile, "a"); + if (!f) { + return NULL; + } + + qemu_set_cloexec(fileno(f)); + return f; +} + #ifndef _WIN32 static bool ga_open_pidfile(const char *pidfile) { @@ -402,7 +415,7 @@ void ga_unset_frozen(GAState *s) * in a frozen state at start up, do it now */ if (s->deferred_options.log_filepath) { - s->log_file = fopen(s->deferred_options.log_filepath, "a"); + s->log_file = ga_open_logfile(s->deferred_options.log_filepath); if (!s->log_file) { s->log_file = stderr; } @@ -884,7 +897,7 @@ int main(int argc, char **argv) become_daemon(pid_filepath); } if (log_filepath) { - FILE *log_file = fopen(log_filepath, "a"); + FILE *log_file = ga_open_logfile(log_filepath); if (!log_file) { g_critical("unable to open specified log file: %s", strerror(errno));