From 01a45021fcd11a31f88b2424b74f3aee432ac3bf Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Tue, 11 Sep 2018 13:59:25 -0700 Subject: [PATCH 1/1] UBUNTU: SAUCE: ena: devm_kzalloc() -> devm_kcalloc() BugLink: http://bugs.launchpad.net/bugs/1792044 As implemented in upstream commit a86854d0c599b3202307abceb68feee4d7061578 "treewide: devm_kzalloc() -> devm_kcalloc()", for ena only. (backported from commit a86854d0c599b3202307abceb68feee4d7061578) Signed-off-by: Kamal Mostafa Acked-by: Acked-by: Stefan Bader Acked-by: Brad Figg Signed-off-by: Kamal Mostafa --- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c index 060cb18fa659..521607bc4393 100644 --- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c +++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c @@ -838,8 +838,8 @@ static void ena_dump_stats_ex(struct ena_adapter *adapter, u8 *buf) return; } - strings_buf = devm_kzalloc(&adapter->pdev->dev, - strings_num * ETH_GSTRING_LEN, + strings_buf = devm_kcalloc(&adapter->pdev->dev, + ETH_GSTRING_LEN, strings_num, GFP_ATOMIC); if (!strings_buf) { netif_err(adapter, drv, netdev, @@ -847,8 +847,8 @@ static void ena_dump_stats_ex(struct ena_adapter *adapter, u8 *buf) return; } - data_buf = devm_kzalloc(&adapter->pdev->dev, - strings_num * sizeof(u64), + data_buf = devm_kcalloc(&adapter->pdev->dev, + strings_num, sizeof(u64), GFP_ATOMIC); if (!data_buf) { netif_err(adapter, drv, netdev, -- 2.39.2