| Message ID | 20200322205439.15231-1-nieklinnenbank@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] hw/arm/orangepi: check for potential NULL pointer when calling blk_is_available | expand |
On Sun, 22 Mar 2020 at 20:54, Niek Linnenbank <nieklinnenbank@gmail.com> wrote: > > The Orange Pi PC initialization function needs to verify that the SD card > block backend is usable before calling the Boot ROM setup routine. When > calling blk_is_available() the input parameter should not be NULL. > This commit ensures that blk_is_available is only called with non-NULL input. > > Reported-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com> > --- > hw/arm/orangepi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to target-arm.next, thanks. -- PMM
diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c index 181f5badab..a9f64c5680 100644 --- a/hw/arm/orangepi.c +++ b/hw/arm/orangepi.c @@ -104,7 +104,7 @@ static void orangepi_init(MachineState *machine) machine->ram); /* Load target kernel or start using BootROM */ - if (!machine->kernel_filename && blk_is_available(blk)) { + if (!machine->kernel_filename && blk && blk_is_available(blk)) { /* Use Boot ROM to copy data from SD card to SRAM */ allwinner_h3_bootrom_setup(h3, blk); }
The Orange Pi PC initialization function needs to verify that the SD card block backend is usable before calling the Boot ROM setup routine. When calling blk_is_available() the input parameter should not be NULL. This commit ensures that blk_is_available is only called with non-NULL input. Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com> --- hw/arm/orangepi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)