[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/8] qemu-ga: add ga_open_logfile()
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 2/8] qemu-ga: add ga_open_logfile() |
Date: |
Mon, 14 Jan 2013 13:55:06 -0600 |
From: Luiz Capitulino <address@hidden>
This function sets O_CLOEXEC on the log file fd so that it isn't
leaked to executed processes.
Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Acked-by: Amos Kong <address@hidden>
Tested-by: Amos Kong <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
---
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
- [Qemu-devel] [PULL 0/8] qemu-ga: cleanups and minor fixes, Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 4/8] qemu-ga: Drop pointless lseek() from ga_open_pidfile(), Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 1/8] qemu-ga: ga_open_pidfile(): use qemu_open(), Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 3/8] qemu-ga: Document intentional fall through in channel_event_cb(), Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 7/8] qemu-ga: Plug fd leak on ga_channel_open() error paths, Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 5/8] qemu-ga: Plug file descriptor leak on ga_open_pidfile() error path, Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 6/8] qemu-ga: Plug fd leak on ga_channel_listen_accept() error path, Michael Roth, 2013/01/14
- [Qemu-devel] [PATCH 2/8] qemu-ga: add ga_open_logfile(),
Michael Roth <=
- [Qemu-devel] [PATCH 8/8] qemu-ga: Handle errors uniformely in ga_channel_open(), Michael Roth, 2013/01/14
- Re: [Qemu-devel] [PULL 0/8] qemu-ga: cleanups and minor fixes, Anthony Liguori, 2013/01/15