diff options
| author | Fei Li | 2019-01-13 15:08:45 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert | 2019-01-23 16:02:07 +0100 |
| commit | 78524330fdb28ebd9606970b10dc835ca308a03d (patch) | |
| tree | 3a93b1c3c8a115d71100367f7d9a344ec862c729 /util | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ipxe-20190122-pull-request'... (diff) | |
| download | qemu-78524330fdb28ebd9606970b10dc835ca308a03d.tar.gz qemu-78524330fdb28ebd9606970b10dc835ca308a03d.tar.xz qemu-78524330fdb28ebd9606970b10dc835ca308a03d.zip | |
Fix segmentation fault when qemu_signal_init fails
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>
Diffstat (limited to 'util')
| -rw-r--r-- | util/main-loop.c | 8 |
1 files 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; } |