]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
UBUNTU: SAUCE: ena: devm_kzalloc() -> devm_kcalloc()
authorKees Cook <keescook@chromium.org>
Tue, 11 Sep 2018 20:59:25 +0000 (13:59 -0700)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 1 Oct 2018 12:40:01 +0000 (14:40 +0200)
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 <kamal@canonical.com>
Acked-by: Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
drivers/net/ethernet/amazon/ena/ena_ethtool.c

index 060cb18fa65963d15ae56cc41164b78d8f0180ed..521607bc43937f0954fb20414c5b1002123c244d 100644 (file)
@@ -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,