From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 1/6] hw/arm/orangepi: check for potential NULL pointer when calling blk_is_available
Date: Mon, 30 Mar 2020 14:36:43 +0100 [thread overview]
Message-ID: <20200330133648.22297-2-peter.maydell@linaro.org> (raw)
In-Reply-To: <20200330133648.22297-1-peter.maydell@linaro.org>
From: Niek Linnenbank <nieklinnenbank@gmail.com>
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>
Message-id: 20200322205439.15231-1-nieklinnenbank@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/arm/orangepi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
index 181f5badab7..a9f64c56800 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);
}
--
2.20.1
next prev parent reply other threads:[~2020-03-30 13:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 13:36 [PULL 0/6] target-arm queue Peter Maydell
2020-03-30 13:36 ` Peter Maydell [this message]
2020-03-30 13:36 ` [PULL 2/6] hw/misc/allwinner-h3-dramc: enforce 64-bit multiply when calculating row mirror address Peter Maydell
2020-03-30 13:36 ` [PULL 3/6] docs/conf.py: Raise ConfigError for bad Sphinx Python version Peter Maydell
2020-03-30 13:36 ` [PULL 4/6] hw/arm/xlnx-zynqmp.c: Avoid memory leak in error-return path Peter Maydell
2020-03-30 13:36 ` [PULL 5/6] hw/arm/xlnx-zynqmp.c: Add missing error-propagation code Peter Maydell
2020-03-30 13:36 ` [PULL 6/6] target/arm: fix incorrect current EL bug in aarch32 exception emulation Peter Maydell
2020-03-30 15:05 ` [PULL 0/6] target-arm queue Peter Maydell
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=20200330133648.22297-2-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=qemu-devel@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).