[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAGXu5jLqkdSYd4MWPm9v49U+6FvgfMLtG1Vz3SUBR999vHshHQ@mail.gmail.com>
Date: Mon, 2 Jul 2018 14:05:38 -0700
From: Kees Cook <keescook@...omium.org>
To: Eric Anholt <eric@...olt.net>
Cc: Stefan Wahren <stefan.wahren@...e.com>,
Arnd Bergmann <arnd@...db.de>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] fixup! firmware: raspberrypi: Remove VLA usage
On Mon, Jul 2, 2018 at 12:45 PM, Eric Anholt <eric@...olt.net> wrote:
> Kees - with this fix to your patch, the kernel boots again (otherwise,
> the FW would try to parse the uninitialized bits of stack and throw
> errors). If you're good with me squashing this in, I'll do so and
> send it to -next.
>
> Signed-off-by: Eric Anholt <eric@...olt.net>
> ---
> drivers/firmware/raspberrypi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
> index b80f15214b73..a200a2174611 100644
> --- a/drivers/firmware/raspberrypi.c
> +++ b/drivers/firmware/raspberrypi.c
> @@ -162,7 +162,7 @@ int rpi_firmware_property(struct rpi_firmware *fw,
> memcpy(data + sizeof(struct rpi_firmware_property_tag_header),
> tag_data, buf_size);
>
> - ret = rpi_firmware_property_list(fw, &data, sizeof(data));
> + ret = rpi_firmware_property_list(fw, &data, buf_size + sizeof(*header));
> memcpy(tag_data,
> data + sizeof(struct rpi_firmware_property_tag_header),
> buf_size);
Eek! Yes, thank you. Yeah, please feel free to squash. Thanks for testing!
-Kees
--
Kees Cook
Pixel Security
Powered by blists - more mailing lists