Commit ee5d0f89 authored by Li Qiang's avatar Li Qiang Committed by Philippe Mathieu-Daudé
Browse files

fw_cfg: Fix -boot reboot-timeout error checking 



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 values
outside 0...0xffff.

Signed-off-by: default avatarLi Qiang <liq3ea@gmail.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <1542777026-2788-3-git-send-email-liq3ea@gmail.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 6912bb0b

hw/nvram/fw_cfg.c

+13 −14
Original line number Diff line number Diff line
@@ -176,26 +176,25 @@ static void fw_cfg_bootsplash(FWCfgState *s) 


static void fw_cfg_reboot(FWCfgState *s)

{

    int reboot_timeout = -1;

    char *p;

    const char *temp;

    const char *reboot_timeout = NULL;

    int64_t rt_val = -1;



    /* get user configuration */

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

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

    if (opts != NULL) {

        temp = qemu_opt_get(opts, "reboot-timeout");

        if (temp != NULL) {

            p = (char *)temp;

            reboot_timeout = strtol(p, &p, 10);

        }

    }

    reboot_timeout = qemu_opt_get(opts, "reboot-timeout");



    if (reboot_timeout) {

        rt_val = qemu_opt_get_number(opts, "reboot-timeout", -1);

        /* validate the input */

    if (reboot_timeout > 0xffff) {

        error_report("reboot timeout is larger than 65535, force it to 65535.");

        reboot_timeout = 0xffff;

        if (rt_val < 0 || rt_val > 0xffff) {

            error_report("reboot timeout is invalid,"

                         "it should be a value between 0 and 65535");

            exit(1);

        }

    }

    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);

}



static void fw_cfg_write(FWCfgState *s, uint8_t value)

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static QemuOptsList qemu_boot_opts = { 
            .type = QEMU_OPT_NUMBER,

        }, {

            .name = "reboot-timeout",

            .type = QEMU_OPT_STRING,

            .type = QEMU_OPT_NUMBER,

        }, {

            .name = "strict",

            .type = QEMU_OPT_BOOL,