From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: fluxion From: Michael Roth Date: Mon, 14 Jan 2013 13:55:06 -0600 Message-Id: <1358193312-15960-3-git-send-email-mdroth@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [PATCH 2/8] qemu-ga: add ga_open_logfile() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, armbru@redhat.com, lcapitulino@redhat.com 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)); -- 1.7.9.5