[Qemu-devel] [PATCH for-3.1] milkymist: Check for failure trying to load BIOS image

Peter Maydell posted 1 patch 7 years ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20181030170032.1844-1-peter.maydell@linaro.org
Test docker-clang@ubuntu passed
Test checkpatch passed
Test asan passed
Test docker-mingw@fedora passed
Test docker-quick@centos7 passed
hw/lm32/milkymist.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
[Qemu-devel] [PATCH for-3.1] milkymist: Check for failure trying to load BIOS image
Posted by Peter Maydell 7 years ago
Check the return value from load_image_targphys(), which tells us
whether our attempt to load the BIOS image into RAM failed.
(Spotted by Coverity, CID 1190305.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/lm32/milkymist.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 321f184595e..63c6894c955 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -138,7 +138,10 @@ milkymist_init(MachineState *machine)
     bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
 
     if (bios_filename) {
-        load_image_targphys(bios_filename, BIOS_OFFSET, BIOS_SIZE);
+        if (load_image_targphys(bios_filename, BIOS_OFFSET, BIOS_SIZE) < 0) {
+            error_report("could not load bios '%s'", bios_filename);
+            exit(1);
+        }
     }
 
     reset_info->bootstrap_pc = BIOS_OFFSET;
-- 
2.19.1


Re: [Qemu-devel] [PATCH for-3.1] milkymist: Check for failure trying to load BIOS image
Posted by Michael Walle 7 years ago
Am 2018-10-30 18:00, schrieb Peter Maydell:
> Check the return value from load_image_targphys(), which tells us
> whether our attempt to load the BIOS image into RAM failed.
> (Spotted by Coverity, CID 1190305.)
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Acked-by: Michael Walle <michael@walle.cc>

Will you put it in your queue, Peter?

-michael

> ---
>  hw/lm32/milkymist.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
> index 321f184595e..63c6894c955 100644
> --- a/hw/lm32/milkymist.c
> +++ b/hw/lm32/milkymist.c
> @@ -138,7 +138,10 @@ milkymist_init(MachineState *machine)
>      bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
> 
>      if (bios_filename) {
> -        load_image_targphys(bios_filename, BIOS_OFFSET, BIOS_SIZE);
> +        if (load_image_targphys(bios_filename, BIOS_OFFSET, BIOS_SIZE) 
> < 0) {
> +            error_report("could not load bios '%s'", bios_filename);
> +            exit(1);
> +        }
>      }
> 
>      reset_info->bootstrap_pc = BIOS_OFFSET;

Re: [Qemu-devel] [PATCH for-3.1] milkymist: Check for failure trying to load BIOS image
Posted by Peter Maydell 7 years ago
On 31 October 2018 at 08:20, Michael Walle <michael@walle.cc> wrote:
> Am 2018-10-30 18:00, schrieb Peter Maydell:
>>
>> Check the return value from load_image_targphys(), which tells us
>> whether our attempt to load the BIOS image into RAM failed.
>> (Spotted by Coverity, CID 1190305.)
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>
>
> Acked-by: Michael Walle <michael@walle.cc>
>
> Will you put it in your queue, Peter?

Sure, I have an arm pullreq I'm putting together anyway.

thanks
-- PMM

Re: [Qemu-devel] [PATCH for-3.1] milkymist: Check for failure trying to load BIOS image
Posted by Philippe Mathieu-Daudé 7 years ago
On 30/10/18 18:00, Peter Maydell wrote:
> Check the return value from load_image_targphys(), which tells us
> whether our attempt to load the BIOS image into RAM failed.
> (Spotted by Coverity, CID 1190305.)
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>   hw/lm32/milkymist.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
> index 321f184595e..63c6894c955 100644
> --- a/hw/lm32/milkymist.c
> +++ b/hw/lm32/milkymist.c
> @@ -138,7 +138,10 @@ milkymist_init(MachineState *machine)
>       bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
>   
>       if (bios_filename) {
> -        load_image_targphys(bios_filename, BIOS_OFFSET, BIOS_SIZE);
> +        if (load_image_targphys(bios_filename, BIOS_OFFSET, BIOS_SIZE) < 0) {
> +            error_report("could not load bios '%s'", bios_filename);
> +            exit(1);
> +        }
>       }
>   
>       reset_info->bootstrap_pc = BIOS_OFFSET;
>