From: Alistair Francis <alistair23@gmail.com> To: Alistair Francis <alistair.francis@wdc.com> Cc: Palmer Dabbelt <palmer@dabbelt.com>, Bin Meng <bmeng.cn@gmail.com>, "open list:RISC-V" <qemu-riscv@nongnu.org>, "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, Peter Maydell <peter.maydell@linaro.org> Subject: Re: [PATCH v2 1/1] hw/riscv/boot: Check the error of fdt_pack() Date: Thu, 15 Jul 2021 16:58:06 +1000 [thread overview] Message-ID: <CAKmqyKP2qy9q2-KJvepiRCdr_6_=eGqKEqKCOC_ciQYTT+ntpQ@mail.gmail.com> (raw) In-Reply-To: <07325315b49d5555269f76094e4bc5296e0643b9.1626303527.git.alistair.francis@wdc.com> 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 >
WARNING: multiple messages have this Message-ID (diff)
From: Alistair Francis <alistair23@gmail.com> To: Alistair Francis <alistair.francis@wdc.com> Cc: "qemu-devel@nongnu.org Developers" <qemu-devel@nongnu.org>, "open list:RISC-V" <qemu-riscv@nongnu.org>, Bin Meng <bmeng.cn@gmail.com>, Palmer Dabbelt <palmer@dabbelt.com>, Peter Maydell <peter.maydell@linaro.org> Subject: Re: [PATCH v2 1/1] hw/riscv/boot: Check the error of fdt_pack() Date: Thu, 15 Jul 2021 16:58:06 +1000 [thread overview] Message-ID: <CAKmqyKP2qy9q2-KJvepiRCdr_6_=eGqKEqKCOC_ciQYTT+ntpQ@mail.gmail.com> (raw) In-Reply-To: <07325315b49d5555269f76094e4bc5296e0643b9.1626303527.git.alistair.francis@wdc.com> 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 >
next prev parent reply other threads:[~2021-07-15 7:00 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-14 23:01 [PATCH v2 1/1] hw/riscv/boot: Check the error of fdt_pack() Alistair Francis 2021-07-14 23:01 ` Alistair Francis 2021-07-15 6:58 ` Alistair Francis [this message] 2021-07-15 6:58 ` Alistair Francis
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAKmqyKP2qy9q2-KJvepiRCdr_6_=eGqKEqKCOC_ciQYTT+ntpQ@mail.gmail.com' \ --to=alistair23@gmail.com \ --cc=alistair.francis@wdc.com \ --cc=bmeng.cn@gmail.com \ --cc=palmer@dabbelt.com \ --cc=peter.maydell@linaro.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-riscv@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.