diff mbox

spapr: Add missing checks for NULL pointers and report failures

Message ID 1426346950-7982-1-git-send-email-sw@weilnetz.de
State Accepted
Headers show

Commit Message

Stefan Weil March 14, 2015, 3:29 p.m. UTC 
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 <sw@weilnetz.de>
---

I suggest removing the "qemu:" prefix from other calls of hw_error
in a later patch.

Regards
Stefan

 hw/ppc/spapr.c |    8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Alexander Graf March 16, 2015, 4:48 p.m. UTC | #1 
On 14.03.15 11:29, Stefan Weil wrote:
> 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 <sw@weilnetz.de>

Thanks, applied to ppc-next (for 2.3).


Alex
diff mbox

Patch

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 0487f52..9c87a70 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);