[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/11] hw/riscv/boot.c: exit early if filename is NULL in load
|
From: |
Daniel Henrique Barboza |
|
Subject: |
[PATCH v4 04/11] hw/riscv/boot.c: exit early if filename is NULL in load_(kernel|initrd) |
|
Date: |
Thu, 29 Dec 2022 15:11:28 -0300 |
riscv_load_kernel() and riscv_load_initrd() works under the assumption
that 'kernel_filename' and 'filename' are not NULL.
This is currently the case since all callers of both functions are
checking for NULL before calling them. Put an assert in both to make
sure that a NULL value for both cases would be considered a bug.
Suggested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
---
hw/riscv/boot.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index 98b80af51b..ad196f0fe4 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -177,6 +177,8 @@ target_ulong riscv_load_kernel(const char *kernel_filename,
{
uint64_t kernel_load_base, kernel_entry;
+ g_assert(kernel_filename != NULL);
+
/*
* NB: Use low address not ELF entry point to ensure that the fw_dynamic
* behaviour when loading an ELF matches the fw_payload, fw_jump and BBL
@@ -209,6 +211,8 @@ hwaddr riscv_load_initrd(const char *filename, uint64_t
mem_size,
{
ssize_t size;
+ g_assert(filename != NULL);
+
/*
* We want to put the initrd far enough into RAM that when the
* kernel is uncompressed it will not clobber the initrd. However
--
2.38.1
- [PATCH v4 00/11] riscv: OpenSBI boot test and cleanups, Daniel Henrique Barboza, 2022/12/29
- [PATCH v4 01/11] tests/avocado: add RISC-V OpenSBI boot test, Daniel Henrique Barboza, 2022/12/29
- [PATCH v4 02/11] hw/riscv/spike: use 'fdt' from MachineState, Daniel Henrique Barboza, 2022/12/29
- [PATCH v4 03/11] hw/riscv/sifive_u: use 'fdt' from MachineState, Daniel Henrique Barboza, 2022/12/29
- [PATCH v4 04/11] hw/riscv/boot.c: exit early if filename is NULL in load_(kernel|initrd),
Daniel Henrique Barboza <=
- [PATCH v4 05/11] hw/riscv/spike.c: load initrd right after riscv_load_kernel(), Daniel Henrique Barboza, 2022/12/29
- [PATCH v4 06/11] hw/riscv: write initrd 'chosen' FDT inside riscv_load_initrd(), Daniel Henrique Barboza, 2022/12/29
- [PATCH v4 07/11] hw/riscv: write bootargs 'chosen' FDT after riscv_load_kernel(), Daniel Henrique Barboza, 2022/12/29
- [PATCH v4 08/11] hw/riscv/boot.c: use MachineState in riscv_load_initrd(), Daniel Henrique Barboza, 2022/12/29
- [PATCH v4 09/11] hw/riscv/boot.c: use MachineState in riscv_load_kernel(), Daniel Henrique Barboza, 2022/12/29
- [PATCH v4 10/11] hw/riscv/boot.c: introduce riscv_load_kernel_and_initrd(), Daniel Henrique Barboza, 2022/12/29