[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-4.0 1/5] Fix segmentation fault when qemu_signal
From: |
Fei Li |
Subject: |
[Qemu-devel] [PATCH for-4.0 1/5] Fix segmentation fault when qemu_signal_init fails |
Date: |
Sun, 13 Jan 2019 22:08:45 +0800 |
From: Fei Li <address@hidden>
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 <address@hidden>
Signed-off-by: Fei Li <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
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.17.2 (Apple Git-113)
- [Qemu-devel] [PATCH for-4.0 0/5] fix some segmentation faults and migration issues, Fei Li, 2019/01/13
- [Qemu-devel] [PATCH for-4.0 3/5] migration: multifd_save_cleanup() can't fail, simplify, Fei Li, 2019/01/13
- [Qemu-devel] [PATCH for-4.0 1/5] Fix segmentation fault when qemu_signal_init fails,
Fei Li <=
- [Qemu-devel] [PATCH for-4.0 5/5] migration: unify error handling for process_incoming_migration_co, Fei Li, 2019/01/13
- [Qemu-devel] [PATCH for-4.0 4/5] migration: add more error handling for postcopy_ram_enable_notify, Fei Li, 2019/01/13
- [Qemu-devel] [PATCH for-4.0 2/5] migration: fix the multifd code when receiving less channels, Fei Li, 2019/01/13
- Re: [Qemu-devel] [PATCH for-4.0 0/5] fix some segmentation faults and migration issues, Fei Li, 2019/01/15