[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] load_uboot_image: don't assume a full header re
From: |
Peter Maydell |
Subject: |
Re: [Qemu-devel] [PATCH] load_uboot_image: don't assume a full header read |
Date: |
Tue, 30 May 2017 12:54:45 +0100 |
On 24 May 2017 at 10:13, Andrew Jones <address@hidden> wrote:
> Don't allow load_uboot_image() to proceed when less bytes than
> header-size was read.
>
> Signed-off-by: Andrew Jones <address@hidden>
> ---
> hw/core/loader.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index bf17b42cbec2..f72930ca4a41 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -611,8 +611,9 @@ static int load_uboot_image(const char *filename, hwaddr
> *ep, hwaddr *loadaddr,
> return -1;
>
> size = read(fd, hdr, sizeof(uboot_image_header_t));
> - if (size < 0)
> + if (size < sizeof(uboot_image_header_t)) {
> goto out;
> + }
>
> bswap_uboot_header(hdr);
>
Applied to target-arm.next, thanks.
-- PMM