From nobody Wed Nov 5 18:32:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536059523599895.6124814583267; Tue, 4 Sep 2018 04:12:03 -0700 (PDT) Received: from localhost ([::1]:50251 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fx9FU-0003hQ-CT for importer@patchew.org; Tue, 04 Sep 2018 07:11:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fx9DG-0001H2-26 for qemu-devel@nongnu.org; Tue, 04 Sep 2018 07:09:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fx9DD-0006Lh-OC for qemu-devel@nongnu.org; Tue, 04 Sep 2018 07:09:38 -0400 Received: from smtp.nue.novell.com ([195.135.221.5]:40788) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fx9DD-0006L0-DJ for qemu-devel@nongnu.org; Tue, 04 Sep 2018 07:09:35 -0400 Received: from localhost.localdomain ([45.122.156.254]) by smtp.nue.novell.com with ESMTP (NOT encrypted); Tue, 04 Sep 2018 13:09:32 +0200 From: Fei Li To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 19:08:18 +0800 Message-Id: <20180904110822.12863-2-fli@suse.com> X-Mailer: git-send-email 2.13.7 In-Reply-To: <20180904110822.12863-1-fli@suse.com> References: <20180904110822.12863-1-fli@suse.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.135.221.5 Subject: [Qemu-devel] [PATCH 1/5] Fix segmentation fault when qemu_signal_init fails X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fli@suse.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently, when qemu_signal_init() fails it only returns a non-zero value but without propagating any Error. But its callers need a non-null err when runs error_report_err(err), or else 0->msg occurs. To avoid such segmentation fault, add a new Error parameter to make the call trace to propagate the err to the final caller. Signed-off-by: Fei Li --- include/qemu/osdep.h | 2 +- util/compatfd.c | 17 ++++++++++++----- util/main-loop.c | 11 +++++++---- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index a91068df0e..09ed85fcb8 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -421,7 +421,7 @@ struct qemu_signalfd_siginfo { additional fields in the future) */ }; =20 -int qemu_signalfd(const sigset_t *mask); +int qemu_signalfd(const sigset_t *mask, Error **errp); void sigaction_invoke(struct sigaction *action, struct qemu_signalfd_siginfo *info); #endif diff --git a/util/compatfd.c b/util/compatfd.c index 980bd33e52..65501de622 100644 --- a/util/compatfd.c +++ b/util/compatfd.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/thread.h" +#include "qapi/error.h" =20 #include =20 @@ -65,7 +66,7 @@ static void *sigwait_compat(void *opaque) } } =20 -static int qemu_signalfd_compat(const sigset_t *mask) +static int qemu_signalfd_compat(const sigset_t *mask, Error **errp) { struct sigfd_compat_info *info; QemuThread thread; @@ -73,11 +74,13 @@ static int qemu_signalfd_compat(const sigset_t *mask) =20 info =3D malloc(sizeof(*info)); if (info =3D=3D NULL) { + error_setg(errp, "Failed to malloc in %s", __func__); errno =3D ENOMEM; return -1; } =20 if (pipe(fds) =3D=3D -1) { + error_setg(errp, "Failed to create a pipe in %s", __func__); free(info); return -1; } @@ -94,17 +97,21 @@ static int qemu_signalfd_compat(const sigset_t *mask) return fds[0]; } =20 -int qemu_signalfd(const sigset_t *mask) +int qemu_signalfd(const sigset_t *mask, Error **errp) { -#if defined(CONFIG_SIGNALFD) int ret; + Error *local_err =3D NULL; =20 +#if defined(CONFIG_SIGNALFD) ret =3D syscall(SYS_signalfd, -1, mask, _NSIG / 8); if (ret !=3D -1) { qemu_set_cloexec(ret); return ret; } #endif - - return qemu_signalfd_compat(mask); + ret =3D qemu_signalfd_compat(mask, &local_err); + if (local_err) { + error_propagate(errp, local_err); + } + return ret; } diff --git a/util/main-loop.c b/util/main-loop.c index affe0403c5..20f6ad3849 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -71,10 +71,11 @@ static void sigfd_handler(void *opaque) } } =20 -static int qemu_signal_init(void) +static int qemu_signal_init(Error **errp) { int sigfd; sigset_t set; + Error *local_err =3D NULL; =20 /* * SIG_IPI must be blocked in the main thread and must not be caught @@ -94,9 +95,10 @@ static int qemu_signal_init(void) pthread_sigmask(SIG_BLOCK, &set, NULL); =20 sigdelset(&set, SIG_IPI); - sigfd =3D qemu_signalfd(&set); + sigfd =3D qemu_signalfd(&set, &local_err); if (sigfd =3D=3D -1) { fprintf(stderr, "failed to create signalfd\n"); + error_propagate(errp, local_err); return -errno; } =20 @@ -109,7 +111,7 @@ static int qemu_signal_init(void) =20 #else /* _WIN32 */ =20 -static int qemu_signal_init(void) +static int qemu_signal_init(Error **errp) { return 0; } @@ -148,8 +150,9 @@ int qemu_init_main_loop(Error **errp) =20 init_clocks(qemu_timer_notify_cb); =20 - ret =3D qemu_signal_init(); + ret =3D qemu_signal_init(&local_error); if (ret) { + error_propagate(errp, local_error); return ret; } =20 --=20 2.13.7