From f798645d16957453ee49a5a2945ed80eeb87cd15 Mon Sep 17 00:00:00 2001

From: Markus Armbruster <armbru@redhat.com>

Date: Mon, 7 Oct 2019 07:35:07 +0100

Subject: [PATCH 14/22] fw_cfg: Fix -boot bootsplash error checking

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Markus Armbruster <armbru@redhat.com>

Message-id: <20191007073509.5887-3-armbru@redhat.com>

Patchwork-id: 90980

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH v2 2/4] fw_cfg: Fix -boot bootsplash error checking

Bugzilla: 1607367

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

From: Li Qiang <liq3ea@gmail.com>

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=T" 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 <liq3ea@gmail.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-Id: <1542777026-2788-2-git-send-email-liq3ea@gmail.com>

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

(cherry picked from commit 6912bb0b3d3b140c70d8cdfd2dff77f9890d7f12)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/nvram/fw_cfg.c | 35 +++++++++++++----------------------

 vl.c              |  2 +-

 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c

index d35ac7b..d7185ea 100644

--- a/hw/nvram/fw_cfg.c

+++ b/hw/nvram/fw_cfg.c

@@ -117,47 +117,38 @@ error:

 static void fw_cfg_bootsplash(FWCfgState *s)

 {

-    int boot_splash_time = -1;

     const char *boot_splash_filename = NULL;

-    char *p;

+    const char *boot_splash_time = NULL;

     char *filename, *file_data;

     gsize file_size;

     int file_type;

-    const char *temp;

     /* get user configuration */

     QemuOptsList *plist = qemu_find_opts("boot-opts");

     QemuOpts *opts = QTAILQ_FIRST(&plist->head);

-    if (opts != NULL) {

-        temp = qemu_opt_get(opts, "splash");

-        if (temp != NULL) {

-            boot_splash_filename = temp;

-        }

-        temp = qemu_opt_get(opts, "splash-time");

-        if (temp != NULL) {

-            p = (char *)temp;

-            boot_splash_time = strtol(p, &p, 10);

-        }

-    }

+    boot_splash_filename = qemu_opt_get(opts, "splash");

+    boot_splash_time = qemu_opt_get(opts, "splash-time");

     /* insert splash time if user configurated */

-    if (boot_splash_time >= 0) {

+    if (boot_splash_time) {

+        int64_t bst_val = 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 = 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] = (uint8_t)(boot_splash_time & 0xff);

-        qemu_extra_params_fw[1] = (uint8_t)((boot_splash_time >> 8) & 0xff);

+        qemu_extra_params_fw[0] = (uint8_t)(bst_val & 0xff);

+        qemu_extra_params_fw[1] = (uint8_t)((bst_val >> 8) & 0xff);

         fw_cfg_add_file(s, "etc/boot-menu-wait", qemu_extra_params_fw, 2);

     }

     /* insert splash file if user configurated */

-    if (boot_splash_filename != NULL) {

+    if (boot_splash_filename) {

         filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, boot_splash_filename);

         if (filename == NULL) {

-            error_report("failed to find file '%s'.", boot_splash_filename);

+            error_report("failed to find file '%s'", boot_splash_filename);

             return;

         }

diff --git a/vl.c b/vl.c

index c778594..e2212f5 100644

--- a/vl.c

+++ b/vl.c

@@ -364,7 +364,7 @@ static QemuOptsList qemu_boot_opts = {

             .type = QEMU_OPT_STRING,

         }, {

             .name = "splash-time",

-            .type = QEMU_OPT_STRING,

+            .type = QEMU_OPT_NUMBER,

         }, {

             .name = "reboot-timeout",

             .type = QEMU_OPT_STRING,

-- 

1.8.3.1