[PATCH] wimax/i2400m: Remove VLAIS

[PATCH] wimax/i2400m: Remove VLAIS

[Matthias Kaehlcke]

From: Behan Webster <behanw@converseincode.com>

Convert Variable Length Array in Struct (VLAIS) to valid C by converting
local struct definition to use a flexible array. The structure is only
used to define a cast of a buffer so the size of the struct is not used
to allocate storage.

Signed-off-by: Behan Webster <behanw@converseincode.com>
Signed-off-by: Mark Charebois <charlebm@gmail.com>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---
 drivers/net/wimax/i2400m/fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index c9c711dcd0e6..a89b5685e68b 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -652,7 +652,7 @@ static int i2400m_download_chunk(struct i2400m *i2400m, const void *chunk,
 	struct device *dev = i2400m_dev(i2400m);
 	struct {
 		struct i2400m_bootrom_header cmd;
-		u8 cmd_payload[chunk_len];
+		u8 cmd_payload[];
 	} __packed *buf;
 	struct i2400m_bootrom_header ack;
 
-- 
2.14.2.920.gcf0c67979c-goog

Re: [PATCH] wimax/i2400m: Remove VLAIS

[Matthias Kaehlcke]

El Mon, Oct 09, 2017 at 12:41:53PM -0700 Matthias Kaehlcke ha dit:

> From: Behan Webster <behanw@converseincode.com>
> 
> Convert Variable Length Array in Struct (VLAIS) to valid C by converting
> local struct definition to use a flexible array. The structure is only
> used to define a cast of a buffer so the size of the struct is not used
> to allocate storage.
> 
> Signed-off-by: Behan Webster <behanw@converseincode.com>
> Signed-off-by: Mark Charebois <charlebm@gmail.com>
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> ---
>  drivers/net/wimax/i2400m/fw.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
> index c9c711dcd0e6..a89b5685e68b 100644
> --- a/drivers/net/wimax/i2400m/fw.c
> +++ b/drivers/net/wimax/i2400m/fw.c
> @@ -652,7 +652,7 @@ static int i2400m_download_chunk(struct i2400m *i2400m, const void *chunk,
>  	struct device *dev = i2400m_dev(i2400m);
>  	struct {
>  		struct i2400m_bootrom_header cmd;
> -		u8 cmd_payload[chunk_len];
> +		u8 cmd_payload[];
>  	} __packed *buf;
>  	struct i2400m_bootrom_header ack;

ping

any comments on this?

RE: [PATCH] wimax/i2400m: Remove VLAIS

[Perez-Gonzalez, Inaky]

> ping
> any comments on this?

None from me; I don't have access to this HW anymore, so I can't validate
if the change would work or not.

Re: [PATCH] wimax/i2400m: Remove VLAIS

[Dan Williams]

On Tue, 2017-10-24 at 21:00 +0000, Perez-Gonzalez, Inaky wrote:
> > ping
> > any comments on this?
> 
> None from me; I don't have access to this HW anymore, so I can't
> validate
> if the change would work or not.

I still have a 5350 around somewhere, I can make sure firmware loads if
you like.

Dan

RE: [PATCH] wimax/i2400m: Remove VLAIS

[Perez-Gonzalez, Inaky]

>On Tue, 2017-10-24 at 21:00 +0000, Perez-Gonzalez, Inaky wrote:
>> > ping any comments on this?
>>
>> None from me; I don't have access to this HW anymore, so I can't
>> validate if the change would work or not.

> I still have a 5350 around somewhere, I can make sure firmware loads if
> you like.

That'd be swell Dan, thx

Re: [PATCH] wimax/i2400m: Remove VLAIS

[Dan Williams]

On Wed, 2017-10-25 at 17:12 +0000, Perez-Gonzalez, Inaky wrote:
> > On Tue, 2017-10-24 at 21:00 +0000, Perez-Gonzalez, Inaky wrote:
> > > > ping any comments on this?
> > > 
> > > None from me; I don't have access to this HW anymore, so I can't
> > > validate if the change would work or not.
> > I still have a 5350 around somewhere, I can make sure firmware
> > loads if
> > you like.
> 
> That'd be swell Dan, thx

Seems to load firmware, read the MAC, and reboot the card.  Couldn't
get userspace tools working in a 5m try but the kernel module debug
traces indicate the card TX/RX-es commands and we can pull out the card
state and rfkill status and things like that.

Inaky, is that enough to verify the patch is OK?

Dan

Re: [PATCH] wimax/i2400m: Remove VLAIS

[Arnd Bergmann]

On Tue, Oct 24, 2017 at 9:46 PM, Matthias Kaehlcke <mka@chromium.org> wrote:
> El Mon, Oct 09, 2017 at 12:41:53PM -0700 Matthias Kaehlcke ha dit:

>> +             u8 cmd_payload[];
>>       } __packed *buf;
>>       struct i2400m_bootrom_header ack;
>
> ping
>
> any comments on this?

What for? The patch is clearly correct and Davem already merged it in
4.14, right?

       Arnd

Re: [PATCH] wimax/i2400m: Remove VLAIS

[Perez-Gonzalez, Inaky]

> On Oct 25, 2017, at 10:39, Dan Williams <dcbw@redhat.com> wrote:
> 
> On Wed, 2017-10-25 at 17:12 +0000, Perez-Gonzalez, Inaky wrote:
>>> On Tue, 2017-10-24 at 21:00 +0000, Perez-Gonzalez, Inaky wrote:
>>>>> ping any comments on this?
>>>> 
>>>> None from me; I don't have access to this HW anymore, so I can't
>>>> validate if the change would work or not.
>>> I still have a 5350 around somewhere, I can make sure firmware
>>> loads if
>>> you like.
>> 
>> That'd be swell Dan, thx
> 
> Seems to load firmware, read the MAC, and reboot the card.  Couldn't
> get userspace tools working in a 5m try but the kernel module debug
> traces indicate the card TX/RX-es commands and we can pull out the card
> state and rfkill status and things like that.
> 
> Inaky, is that enough to verify the patch is OK?

It is, thanks Dan

Acked-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>