Skip to content

Commit

Permalink
qemu-ga: add ga_open_logfile()
Browse files Browse the repository at this point in the history
This function sets O_CLOEXEC on the log file fd so that it isn't
leaked to executed processes.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Amos Kong <akong@redhat.com>
Tested-by: Amos Kong <akong@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
  • Loading branch information
Luiz Capitulino authored and mdroth committed Jan 14, 2013
1 parent 6ffacc5 commit 9e92f6d
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions qga/main.c
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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));
Expand Down

0 comments on commit 9e92f6d

Please sign in to comment.