[Qemu-devel] [PATCH] spapr: Add missing checks for NULL pointers and report failures

[Qemu-devel] [PATCH] spapr: Add missing checks for NULL pointers and report failures

[Stefan Weil]

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(+)

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);
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH] spapr: Add missing checks for NULL pointers and report failures

[Alexander Graf]

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

Re: [Qemu-devel] [PATCH] spapr: Add missing checks for NULL pointers and report failures

[Alexander Graf]

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>

I've squashed the patch below into your commit as well.


Alex

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 9c87a70..7febff7 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1507,7 +1507,7 @@ 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);
+        hw_error("Could not find LPAR rtas '%s'\n", "spapr-rtas.bin");
         exit(1);
     }
     spapr->rtas_size = get_image_size(filename);

Re: [Qemu-devel] [PATCH] spapr: Add missing checks for NULL pointers and report failures

[Stefan Weil]

Am 16.03.2015 um 22:48 schrieb Alexander Graf:
>
> 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>
> I've squashed the patch below into your commit as well.
>
>
> Alex
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 9c87a70..7febff7 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1507,7 +1507,7 @@ 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);
> +        hw_error("Could not find LPAR rtas '%s'\n", "spapr-rtas.bin");
>           exit(1);
>       }
>       spapr->rtas_size = get_image_size(filename);

I really should not make last minute changes after the build test.

Here I previously had included the filename in the format string,
but then I decided to make the format string identical to the
2nd one and moved the filename out of the string without adding "".

Sorry for the trouble and thank you for the fix.

Stefan