From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Gustavo A. R. Silva" Subject: [PATCH] cxgb3: remove VLA Date: Mon, 5 Mar 2018 23:39:34 -0600 Message-ID: <20180306053934.GA17162@embeddedgus> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Gustavo A. R. Silva" To: Santosh Raspatur Return-path: Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org In preparation to enabling -Wvla, remove VLA and replace it with dynamic memory allocation. Signed-off-by: Gustavo A. R. Silva --- 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