From nobody Tue Apr 30 02:47:26 2024 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; dkim=fail; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542642587697543.1901779590356; Mon, 19 Nov 2018 07:49:47 -0800 (PST) Received: from localhost ([::1]:57320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlnt-0004E1-4w for importer@patchew.org; Mon, 19 Nov 2018 10:49:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlmU-0003TI-Vr for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:48:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOlmU-00016S-4U for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:48:10 -0500 Received: from m12-16.163.com ([220.181.12.16]:52021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlmT-00014u-GX for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:48:10 -0500 Received: from ubuntu.localdomain (unknown [36.22.237.106]) by smtp12 (Coremail) with SMTP id EMCowADHTWIx2_JbFk1cAw--.51875S3; Mon, 19 Nov 2018 23:48:07 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=8PP/krRuVQKsYiWMWa 7RbIwmba5EYnKtjgyVGuceS1g=; b=C96XF2T8qc5YTYEbDe+p1D6F2jWfUktWb6 QIT11eJHxRKzvumMqaDfvlvQgthiJ1JQb/3cG7poX0RjseuMLGssHOBQBt2B0ZxM mFBCmlwv4yT9EswBCx1lHxHmL6+hSEACYKvSI40aOZoIdXrLPtgj/oEGmmoen3Ra Tz12omavg= From: Li Qiang To: pbonzini@redhat.com, kraxel@redhat.com, lersek@redhat.com, philmd@redhat.com, armbru@redhat.com Date: Mon, 19 Nov 2018 07:47:35 -0800 Message-Id: <20181119154737.9840-2-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119154737.9840-1-liq3ea@163.com> References: <20181119154737.9840-1-liq3ea@163.com> X-CM-TRANSID: EMCowADHTWIx2_JbFk1cAw--.51875S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxJFyDZr4UCrWkKryxurWkCrg_yoW5tF1xpF Z8J3Z8G3s5JFZrXrsxZw4DuF1ftrs7XF1UX3y5Xw4kArWUXr1kuw4xKFySv3y2yrZ7Zwsr WF4rXrW7JF17XFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UmiihUUUUU= X-Originating-IP: [36.22.237.106] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBaxcEbVets57wIAAAsS X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.16 Subject: [Qemu-devel] [PATCH 1/3] fw_cfg: fix -boot bootsplash error checking 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: Li Qiang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" fw_cfg_bootsplash() gets option parameter "splash-time" with qemu_opt_get(), then converts it to an integer by hand. It neglects to check that conversion for errors. This is needlessly complicated and error-prone. But as "splash-time not specified" is not the same as "splash-time=3DT" for any T, we need use qemu_opt_get() to check if splash time exists. This patch also make the qemu exit when finding or loading splash file failed. Signed-off-by: Li Qiang Reviewed-by: Markus Armbruster --- hw/nvram/fw_cfg.c | 40 ++++++++++++++++------------------------ vl.c | 2 +- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 946f765f7f..78f43dad93 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -118,55 +118,47 @@ error: =20 static void fw_cfg_bootsplash(FWCfgState *s) { - int boot_splash_time =3D -1; const char *boot_splash_filename =3D NULL; - char *p; + const char *boot_splash_time =3D NULL; char *filename, *file_data; gsize file_size; int file_type; - const char *temp; =20 /* get user configuration */ QemuOptsList *plist =3D qemu_find_opts("boot-opts"); QemuOpts *opts =3D QTAILQ_FIRST(&plist->head); - if (opts !=3D NULL) { - temp =3D qemu_opt_get(opts, "splash"); - if (temp !=3D NULL) { - boot_splash_filename =3D temp; - } - temp =3D qemu_opt_get(opts, "splash-time"); - if (temp !=3D NULL) { - p =3D (char *)temp; - boot_splash_time =3D strtol(p, &p, 10); - } - } + boot_splash_filename =3D qemu_opt_get(opts, "splash"); + boot_splash_time =3D qemu_opt_get(opts, "splash-time"); =20 /* insert splash time if user configurated */ - if (boot_splash_time >=3D 0) { + if (boot_splash_time) { + int64_t bst_val =3D qemu_opt_get_number(opts, "splash-time", -1); /* validate the input */ - if (boot_splash_time > 0xffff) { - error_report("splash time is big than 65535, force it to 65535= ."); - boot_splash_time =3D 0xffff; + if (bst_val < 0 || bst_val > 0xffff) { + error_report("splash time is invalid," + "it should be a value between 0 and 65535"); + exit(1); } /* use little endian format */ - qemu_extra_params_fw[0] =3D (uint8_t)(boot_splash_time & 0xff); - qemu_extra_params_fw[1] =3D (uint8_t)((boot_splash_time >> 8) & 0x= ff); + qemu_extra_params_fw[0] =3D (uint8_t)(bst_val & 0xff); + qemu_extra_params_fw[1] =3D (uint8_t)((bst_val >> 8) & 0xff); fw_cfg_add_file(s, "etc/boot-menu-wait", qemu_extra_params_fw, 2); } =20 /* insert splash file if user configurated */ - if (boot_splash_filename !=3D NULL) { + if (boot_splash_filename) { filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, boot_splash_filen= ame); if (filename =3D=3D NULL) { - error_report("failed to find file '%s'.", boot_splash_filename= ); - return; + error_report("failed to find file '%s'", boot_splash_filename); + exit(1); } =20 /* loading file data */ file_data =3D read_splashfile(filename, &file_size, &file_type); if (file_data =3D=3D NULL) { g_free(filename); - return; + error_report("failed to read file '%s'", boot_splash_filename); + exit(1); } g_free(boot_splash_filedata); boot_splash_filedata =3D (uint8_t *)file_data; diff --git a/vl.c b/vl.c index fa25d1ae2d..96ac0ddcf6 100644 --- a/vl.c +++ b/vl.c @@ -336,7 +336,7 @@ static QemuOptsList qemu_boot_opts =3D { .type =3D QEMU_OPT_STRING, }, { .name =3D "splash-time", - .type =3D QEMU_OPT_STRING, + .type =3D QEMU_OPT_NUMBER, }, { .name =3D "reboot-timeout", .type =3D QEMU_OPT_STRING, --=20 2.17.1 From nobody Tue Apr 30 02:47:26 2024 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; dkim=fail; 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 154264271587159.94517195995127; Mon, 19 Nov 2018 07:51:55 -0800 (PST) Received: from localhost ([::1]:57334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlq1-0005a8-Ft for importer@patchew.org; Mon, 19 Nov 2018 10:51:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlmW-0003YU-Ox for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:48:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOlmW-00017b-19 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:48:12 -0500 Received: from m12-16.163.com ([220.181.12.16]:52301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlmV-00016a-F9 for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:48:11 -0500 Received: from ubuntu.localdomain (unknown [36.22.237.106]) by smtp12 (Coremail) with SMTP id EMCowADHTWIx2_JbFk1cAw--.51875S4; Mon, 19 Nov 2018 23:48:09 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=rleRuQnIapmBPveMbb QzIT3vfeOH5ubJ7yg7FJmauFQ=; b=gRlb1BERh72vRzuFaq7jRI5l7t9jv8hevZ l8GgFVxPSNBX2h3AWtHZhuIH0kcCWTvWuYN96ic/s67vKyfAyJKEbMZAjB1sCqhF 0FgW11YrBrzpiXxYdqqE3Nr0kLJUR1l3x+lTcoyKKJoE7CTbhn9nnp4vg5mZ2UTe Kc4sQTVtk= From: Li Qiang To: pbonzini@redhat.com, kraxel@redhat.com, lersek@redhat.com, philmd@redhat.com, armbru@redhat.com Date: Mon, 19 Nov 2018 07:47:36 -0800 Message-Id: <20181119154737.9840-3-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119154737.9840-1-liq3ea@163.com> References: <20181119154737.9840-1-liq3ea@163.com> X-CM-TRANSID: EMCowADHTWIx2_JbFk1cAw--.51875S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7Kr47ZFy8AF4DCrW8Kry8Krg_yoW8tF1fpF Zxta1DJrWkXrW3Jr4akw1DWr1UXwn7Xr4DZF4DA3yIvr13Ar1kA3yxGas3Kay7ZF93tF4a gF4Fgw1UJanrGaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UPkuxUUUUU= X-Originating-IP: [36.22.237.106] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBaxkEbVets57wNgAAsK X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.16 Subject: [Qemu-devel] [PATCH 2/3] fw_cfg: fix -boot reboot-timeout error checking 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: Li Qiang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" fw_cfg_reboot() gets option parameter "reboot-timeout" with qemu_opt_get(), then converts it to an integer by hand. It neglects to check that conversion for errors, and fails to reject negative values. Positive values above the limit get reported and replaced by the limit. This patch checks for conversion errors properly, and reject all valus outside 0...0xffff. Signed-off-by: Li Qiang Reviewed-by: Markus Armbruster --- hw/nvram/fw_cfg.c | 27 +++++++++++++-------------- vl.c | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 78f43dad93..0489d63a1b 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -178,26 +178,25 @@ static void fw_cfg_bootsplash(FWCfgState *s) =20 static void fw_cfg_reboot(FWCfgState *s) { - int reboot_timeout =3D -1; - char *p; - const char *temp; + const char *reboot_timeout =3D NULL; + int64_t rt_val =3D -1; =20 /* get user configuration */ QemuOptsList *plist =3D qemu_find_opts("boot-opts"); QemuOpts *opts =3D QTAILQ_FIRST(&plist->head); - if (opts !=3D NULL) { - temp =3D qemu_opt_get(opts, "reboot-timeout"); - if (temp !=3D NULL) { - p =3D (char *)temp; - reboot_timeout =3D strtol(p, &p, 10); + reboot_timeout =3D qemu_opt_get(opts, "reboot-timeout"); + + if (reboot_timeout) { + rt_val =3D qemu_opt_get_number(opts, "reboot-timeout", -1); + /* validate the input */ + if (rt_val < 0 || rt_val > 0xffff) { + error_report("reboot timeout is invalid," + "it should be a value between 0 and 65535"); + exit(1); } } - /* validate the input */ - if (reboot_timeout > 0xffff) { - error_report("reboot timeout is larger than 65535, force it to 655= 35."); - reboot_timeout =3D 0xffff; - } - fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup(&reboot_timeout, 4),= 4); + + fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup(&rt_val, 4), 4); } =20 static void fw_cfg_write(FWCfgState *s, uint8_t value) diff --git a/vl.c b/vl.c index 96ac0ddcf6..38a1759461 100644 --- a/vl.c +++ b/vl.c @@ -339,7 +339,7 @@ static QemuOptsList qemu_boot_opts =3D { .type =3D QEMU_OPT_NUMBER, }, { .name =3D "reboot-timeout", - .type =3D QEMU_OPT_STRING, + .type =3D QEMU_OPT_NUMBER, }, { .name =3D "strict", .type =3D QEMU_OPT_BOOL, --=20 2.17.1 From nobody Tue Apr 30 02:47:26 2024 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; dkim=fail; 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542642715754249.26540839309177; Mon, 19 Nov 2018 07:51:55 -0800 (PST) Received: from localhost ([::1]:57333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlpz-0005Z7-MC for importer@patchew.org; Mon, 19 Nov 2018 10:51:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlmZ-0003cy-Il for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:48:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOlmX-00018U-Se for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:48:15 -0500 Received: from m12-16.163.com ([220.181.12.16]:52575) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOlmX-00017h-8l for qemu-devel@nongnu.org; Mon, 19 Nov 2018 10:48:13 -0500 Received: from ubuntu.localdomain (unknown [36.22.237.106]) by smtp12 (Coremail) with SMTP id EMCowADHTWIx2_JbFk1cAw--.51875S5; Mon, 19 Nov 2018 23:48:11 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=/4W4dH0MiRJvranPW4 QvTbZVQ+fmb+Q0190j7NLpws8=; b=moyQHekCkN8BEJDOaFqp9fBGXcs3O3jvAQ WsRGcLhDuc/xcijNPfmtnTAYZAPRkvUg62aN7sylTBiv/FrxZZMtTzFKWFty6mTw 29UJ0FQoRxmATWNsqkOswjX3swentCgQRBsS4JTajr5D3kyEJeZpMKSky93yHa0E QS5CIT0xA= From: Li Qiang To: pbonzini@redhat.com, kraxel@redhat.com, lersek@redhat.com, philmd@redhat.com, armbru@redhat.com Date: Mon, 19 Nov 2018 07:47:37 -0800 Message-Id: <20181119154737.9840-4-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181119154737.9840-1-liq3ea@163.com> References: <20181119154737.9840-1-liq3ea@163.com> X-CM-TRANSID: EMCowADHTWIx2_JbFk1cAw--.51875S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7XFyxGFyDZw13AFy3KFWktFb_yoW8Jr4kpF WkJ3WkKrs7JrW5Z34ag3W7AFyxW39xXF1YqayUZa4Ivrn8JF97Xa1UKa1FkrW8trZ5Wa1q 9r43XrWFy3WjqFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UhiSLUUUUU= X-Originating-IP: [36.22.237.106] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiKRkEbVXloqekmAABsR X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.16 Subject: [Qemu-devel] [PATCH 3/3] fw_cfg: make qemu_extra_params_fw locally 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: Li Qiang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" qemu_extra_params_fw[] has external linkage, but is used only in fw_cfg_bootsplash(), it makes sense to make it locally. Suggested-by: Markus Armbruster Signed-off-by: Li Qiang Reviewed-by: Markus Armbruster --- hw/nvram/fw_cfg.c | 1 + include/sysemu/sysemu.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 0489d63a1b..4eddd6a885 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -120,6 +120,7 @@ static void fw_cfg_bootsplash(FWCfgState *s) { const char *boot_splash_filename =3D NULL; const char *boot_splash_time =3D NULL; + uint8_t qemu_extra_params_fw[2]; char *filename, *file_data; gsize file_size; int file_type; diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 8d6095d98b..f8608d24d9 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -133,7 +133,6 @@ extern uint8_t *boot_splash_filedata; extern size_t boot_splash_filedata_size; extern bool enable_mlock; extern bool enable_cpu_pm; -extern uint8_t qemu_extra_params_fw[2]; extern QEMUClockType rtc_clock; extern const char *mem_path; extern int mem_prealloc; --=20 2.17.1