[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 1/1] hw/riscv/boot: Check the error of fdt_pack()
From: |
Alistair Francis |
Subject: |
Re: [PATCH v2 1/1] hw/riscv/boot: Check the error of fdt_pack() |
Date: |
Thu, 15 Jul 2021 16:58:06 +1000 |
On Thu, Jul 15, 2021 at 9:01 AM Alistair Francis
<alistair.francis@wdc.com> wrote:
>
> Coverity reports that we don't check the error result of fdt_pack(), so
> let's save the result and assert that it is 0.
>
> Fixes: Coverity CID 1458136
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Thanks!
Applied to riscv-to-apply.next
Alistair
> ---
> hw/riscv/boot.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index 0d38bb7426..993bf89064 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -182,7 +182,7 @@ uint32_t riscv_load_fdt(hwaddr dram_base, uint64_t
> mem_size, void *fdt)
> {
> uint32_t temp, fdt_addr;
> hwaddr dram_end = dram_base + mem_size;
> - int fdtsize = fdt_totalsize(fdt);
> + int ret, fdtsize = fdt_totalsize(fdt);
>
> if (fdtsize <= 0) {
> error_report("invalid device-tree");
> @@ -198,7 +198,9 @@ uint32_t riscv_load_fdt(hwaddr dram_base, uint64_t
> mem_size, void *fdt)
> temp = MIN(dram_end, 3072 * MiB);
> fdt_addr = QEMU_ALIGN_DOWN(temp - fdtsize, 16 * MiB);
>
> - fdt_pack(fdt);
> + ret = fdt_pack(fdt);
> + /* Should only fail if we've built a corrupted tree */
> + g_assert(ret == 0);
> /* copy in the device tree */
> qemu_fdt_dumpdtb(fdt, fdtsize);
>
> --
> 2.31.1
>