From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, peterx@redhat.com,
xiaoguangrong@tencent.com, marcandre.lureau@redhat.com,
shirley17fei@gmail.com, lifei1214@126.com
Subject: [Qemu-devel] [PULL 1/9] Fix segmentation fault when qemu_signal_init fails
Date: Wed, 23 Jan 2019 15:58:22 +0000 [thread overview]
Message-ID: <20190123155830.8459-2-dgilbert@redhat.com> (raw)
In-Reply-To: <20190123155830.8459-1-dgilbert@redhat.com>
From: Fei Li <fli@suse.com>
When qemu_signal_init() fails in qemu_init_main_loop(), we return
without setting an error. Its callers crash then when they try to
report the error with error_report_err().
To avoid such segmentation fault, add a new Error parameter to make
the call trace to propagate the err to the final caller.
Fixes: 2f78e491d7b46542158ce0b8132ee4e05bc0ade4
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Fei Li <fli@suse.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190113140849.38339-2-lifei1214@126.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
util/main-loop.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/main-loop.c b/util/main-loop.c
index affe0403c5..443cb4cfe8 100644
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -71,7 +71,7 @@ static void sigfd_handler(void *opaque)
}
}
-static int qemu_signal_init(void)
+static int qemu_signal_init(Error **errp)
{
int sigfd;
sigset_t set;
@@ -96,7 +96,7 @@ static int qemu_signal_init(void)
sigdelset(&set, SIG_IPI);
sigfd = qemu_signalfd(&set);
if (sigfd == -1) {
- fprintf(stderr, "failed to create signalfd\n");
+ error_setg_errno(errp, errno, "failed to create signalfd");
return -errno;
}
@@ -109,7 +109,7 @@ static int qemu_signal_init(void)
#else /* _WIN32 */
-static int qemu_signal_init(void)
+static int qemu_signal_init(Error **errp)
{
return 0;
}
@@ -148,7 +148,7 @@ int qemu_init_main_loop(Error **errp)
init_clocks(qemu_timer_notify_cb);
- ret = qemu_signal_init();
+ ret = qemu_signal_init(errp);
if (ret) {
return ret;
}
--
2.20.1
next prev parent reply other threads:[~2019-01-23 15:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-23 15:58 [Qemu-devel] [PULL 0/9] migration queue Dr. David Alan Gilbert (git)
2019-01-23 15:58 ` Dr. David Alan Gilbert (git) [this message]
2019-01-23 15:58 ` [Qemu-devel] [PULL 2/9] migration: fix the multifd code when receiving less channels Dr. David Alan Gilbert (git)
2019-01-23 15:58 ` [Qemu-devel] [PULL 3/9] migration: multifd_save_cleanup() can't fail, simplify Dr. David Alan Gilbert (git)
2019-01-23 15:58 ` [Qemu-devel] [PULL 4/9] migration: add more error handling for postcopy_ram_enable_notify Dr. David Alan Gilbert (git)
2019-01-23 15:58 ` [Qemu-devel] [PULL 5/9] migration: unify error handling for process_incoming_migration_co Dr. David Alan Gilbert (git)
2019-01-23 15:58 ` [Qemu-devel] [PULL 6/9] migration/rdma: unregister fd handler Dr. David Alan Gilbert (git)
2019-01-23 15:58 ` [Qemu-devel] [PULL 7/9] tests: add /vmstate/simple/array Dr. David Alan Gilbert (git)
2019-01-23 15:58 ` [Qemu-devel] [PULL 8/9] vmstate: constify SaveVMHandlers Dr. David Alan Gilbert (git)
2019-01-23 15:58 ` [Qemu-devel] [PULL 9/9] migration: introduce pages-per-second Dr. David Alan Gilbert (git)
2019-01-24 15:04 ` [Qemu-devel] [PULL 0/9] migration queue Peter Maydell
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=20190123155830.8459-2-dgilbert@redhat.com \
--to=dgilbert@redhat.com \
--cc=lifei1214@126.com \
--cc=marcandre.lureau@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=shirley17fei@gmail.com \
--cc=xiaoguangrong@tencent.com \
/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).