Re: [PATCH] fixup! firmware: raspberrypi: Remove VLA usage

From: Eric Anholt
Date: Thu Jul 05 2018 - 15:27:36 EST


Kees Cook <keescook@xxxxxxxxxxxx> writes:

> On Mon, Jul 2, 2018 at 12:45 PM, Eric Anholt <eric@xxxxxxxxxx> 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@xxxxxxxxxx>
>> ---
>> 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!

Squashed and sent the PR. Thanks!

Attachment: signature.asc
Description: PGP signature