2018-03-06 06:05:40

by Gustavo A. R. Silva

Subject: [PATCH] cxgb3: remove VLA

In preparation to enabling -Wvla, remove VLA and replace it
with dynamic memory allocation.

Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
index a89721f..ad6a280 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c
@@ -683,20 +683,37 @@ int t3_seeprom_wp(struct adapter *adapter, int enable)

static int vpdstrtouint(char *s, int len, unsigned int base, unsigned int *val)
{
- char tok[len + 1];
+ char *tok;
+ int ret;
+
+ tok = kcalloc(len + 1, sizeof(*tok), GFP_KERNEL);
+ if (!tok)
+ return -ENOMEM;

memcpy(tok, s, len);
tok[len] = 0;
- return kstrtouint(strim(tok), base, val);
+ ret = kstrtouint(strim(tok), base, val);
+
+ kfree(tok);
+ return ret;
}

static int vpdstrtou16(char *s, int len, unsigned int base, u16 *val)
{
- char tok[len + 1];
+ char *tok;
+ int ret;
+
+ tok = kcalloc(len + 1, sizeof(*tok), GFP_KERNEL);
+ if (!tok)
+ return -ENOMEM;

memcpy(tok, s, len);
tok[len] = 0;
- return kstrtou16(strim(tok), base, val);
+
+ ret = kstrtou16(strim(tok), base, val);
+
+ kfree(tok);
+ return ret;
}

/**
--
2.7.4

2018-03-07 17:28:01

by David Miller

Subject: Re: [PATCH] cxgb3: remove VLA

From: "Gustavo A. R. Silva" <[email protected]>
Date: Mon, 5 Mar 2018 23:39:34 -0600

> In preparation to enabling -Wvla, remove VLA and replace it
> with dynamic memory allocation.
>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

All of these lengths are limited by the encoding of the field in the
VPD, which is a u8, and thus 255 bytes.

Please just change the 'len' argument to these functions to a u8 and
use a 256 byte buffer on the stack.

Thanks.

2018-03-07 17:33:09

by Gustavo A. R. Silva

Subject: Re: [PATCH] cxgb3: remove VLA

On 03/07/2018 11:25 AM, David Miller wrote:
> From: "Gustavo A. R. Silva" <[email protected]>
> Date: Mon, 5 Mar 2018 23:39:34 -0600
>
>> In preparation to enabling -Wvla, remove VLA and replace it
>> with dynamic memory allocation.
>>
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>
> All of these lengths are limited by the encoding of the field in the
> VPD, which is a u8, and thus 255 bytes.
>
> Please just change the 'len' argument to these functions to a u8 and
> use a 256 byte buffer on the stack.
>
> Thanks.
>


OK. I got it.

Thanks for the feedback.
--
Gustavo