[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2.3 2/5] spapr: Add missing checks for NULL pointers
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PULL 2.3 2/5] spapr: Add missing checks for NULL pointers and report failures |
Date: |
Wed, 25 Mar 2015 22:54:57 +0100 |
From: Stefan Weil <address@hidden>
This fixes potential runtime crashes and two warnings from Coverity.
The new error message does not add a prefix "qemu:" because that is
already done in function hw_error. It also starts with an uppercase
letter because that seems to be the mostly used form.
Signed-off-by: Stefan Weil <address@hidden>
[agraf: fix typo]
Signed-off-by: Alexander Graf <address@hidden>
---
hw/ppc/spapr.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 0487f52..7febff7 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1506,6 +1506,10 @@ static void ppc_spapr_init(MachineState *machine)
}
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "spapr-rtas.bin");
+ if (!filename) {
+ hw_error("Could not find LPAR rtas '%s'\n", "spapr-rtas.bin");
+ exit(1);
+ }
spapr->rtas_size = get_image_size(filename);
spapr->rtas_blob = g_malloc(spapr->rtas_size);
if (load_image_size(filename, spapr->rtas_blob, spapr->rtas_size) < 0) {
@@ -1623,6 +1627,10 @@ static void ppc_spapr_init(MachineState *machine)
bios_name = FW_FILE_NAME;
}
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
+ if (!filename) {
+ hw_error("Could not find LPAR rtas '%s'\n", bios_name);
+ exit(1);
+ }
fw_size = load_image_targphys(filename, 0, FW_MAX_SIZE);
if (fw_size < 0) {
hw_error("qemu: could not load LPAR rtas '%s'\n", filename);
--
1.8.1.4
- [Qemu-devel] [PULL 2.3 0/5] ppc patch queue 2015-03-25 for 2.3, Alexander Graf, 2015/03/25
- [Qemu-devel] [PULL 2.3 2/5] spapr: Add missing checks for NULL pointers and report failures,
Alexander Graf <=
- [Qemu-devel] [PULL 2.3 3/5] target-ppc: Remove POWER5+ v0.0 that never existed, Alexander Graf, 2015/03/25
- [Qemu-devel] [PULL 2.3 1/5] pseries: Update SLOF firmware image to qemu-slof-20150313, Alexander Graf, 2015/03/25
- [Qemu-devel] [PULL 2.3 5/5] powerpc: fix -machine usb=no for newworld and pseries machines, Alexander Graf, 2015/03/25
- [Qemu-devel] [PULL 2.3 4/5] PPC: pseries: Implement boot once=foo, Alexander Graf, 2015/03/25
- Re: [Qemu-devel] [PULL 2.3 0/5] ppc patch queue 2015-03-25 for 2.3, Peter Maydell, 2015/03/26