From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: mprivozn@redhat.com, aliguori@us.ibm.com, eblake@redhat.com,
jcody@redhat.com, lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH 12/13] qemu-ga: fix segv after failure to open log file
Date: Tue, 15 May 2012 09:48:58 -0500 [thread overview]
Message-ID: <1337093339-10786-13-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1337093339-10786-1-git-send-email-mdroth@linux.vnet.ibm.com>
Currently, if we fail to open the specified log file (generally due to a
permissions issue), we'll assign NULL to the logfile handle (stderr,
initially) used by the logging routines, which can cause a segfault to
occur when we attempt to report the error before exiting.
Instead, only re-assign if the open() was successful.
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
qemu-ga.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/qemu-ga.c b/qemu-ga.c
index 3a88333..42e271f 100644
--- a/qemu-ga.c
+++ b/qemu-ga.c
@@ -836,12 +836,13 @@ int main(int argc, char **argv)
become_daemon(pid_filepath);
}
if (log_filepath) {
- s->log_file = fopen(log_filepath, "a");
- if (!s->log_file) {
+ FILE *log_file = fopen(log_filepath, "a");
+ if (!log_file) {
g_critical("unable to open specified log file: %s",
strerror(errno));
goto out_bad;
}
+ s->log_file = log_file;
}
}
--
1.7.4.1
next prev parent reply other threads:[~2012-05-15 14:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-15 14:48 [Qemu-devel] [PULL] qemu-ga fixes for 1.1 Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 01/13] qapi: add support for command options Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 02/13] qemu-ga: don't warn on no command return Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 03/13] qemu-ga: guest-shutdown: don't emit a success response Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 04/13] qemu-ga: guest-suspend-disk: " Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 05/13] qemu-ga: guest-suspend-ram: " Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 06/13] qemu-ga: guest-suspend-hybrid: " Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 07/13] qemu-ga: make reopen_fd_to_null() public Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 08/13] qemu-ga: become_daemon(): reopen standard fds to /dev/null Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 09/13] qemu-ga: guest-suspend: make the API synchronous Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 10/13] qemu-ga: guest-shutdown: become synchronous Michael Roth
2012-05-15 14:48 ` [Qemu-devel] [PATCH 11/13] qemu-ga: guest-shutdown: use only async-signal-safe functions Michael Roth
2012-05-15 14:48 ` Michael Roth [this message]
2012-05-15 14:48 ` [Qemu-devel] [PATCH 13/13] qemu-ga: align versioning with QEMU_VERSION Michael Roth
2012-05-21 16:51 ` [Qemu-devel] [PULL] qemu-ga fixes for 1.1 Luiz Capitulino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337093339-10786-13-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=aliguori@us.ibm.com \
--cc=eblake@redhat.com \
--cc=jcody@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=mprivozn@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).