From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EF42FA0351 for ; Thu, 6 Aug 2020 11:59:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E69791C11B; Thu, 6 Aug 2020 11:59:19 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id B8C781C11B for ; Thu, 6 Aug 2020 11:59:18 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id r2so38303975wrs.8 for ; Thu, 06 Aug 2020 02:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/4uvaLaXb3VIQteTO/yQ2Y57MBivwslJrUwO9EDiOoE=; b=TNsqrvb/Et6HzK4qwv6tWuTW4+WIZjrgn3RdH3KuMGuW/DcTzk5R3wO9ki5D0yGqen XgBVvvKjwPDSgYSjfyBVK7UxWgviJT9RcksN2jUsDLSS6i+EbkrUZ38p4Eai+6tUyt/O v7FxzMXJ3wbjZ3ugUOzZtMBh0crUn+FjED/PIMOI1ooXMAlrzHnInfSEkVh1DAUYOarT bwdpO2PYlbQ6R63t+1PkOr5yQJ4qozOW87Y1zwHDNBcKP79kKowK3bD2Vx9oESGfO4J4 2+QI8hwJUPxWRmVhkQCnZPYTjOWKFoR2IlpZVVHAOIUzmPEboqi5bRKCTcUwtND8Nae8 bI3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/4uvaLaXb3VIQteTO/yQ2Y57MBivwslJrUwO9EDiOoE=; b=M1uEh5bMcjD5pMMLG0HhxzCbn3KIEB131L5ypxpv89/Zo19koLPcWDbJLAP0rEY0T9 joMnuk9gbiKBOeUTw1df5axFGBT7pJZKzYY+DiHWB8YokQlv9hkw7tH3IVK7Bxb4G3JD 4CQLWq+6Y98uenGfEdVfbfqS7CUfw0t0TonJX82xW7oXPcQCFCFER7uB3OfO7MVjwpgr y6E3kzyJHsUsSgKmfyZ3QEUU13u6HvGGPlCVhoFN0jhPRAhVwAbcaKh/SGM9mIVwNCAt +xv6ftcRjYAasrkj79ZO7OGjMgPkyKGxS1q0uIKoxU+pOm8GJa6PybqDOlDU/PdXYePr KSJw== X-Gm-Message-State: AOAM533gLTvaWeq+vXBvVeHVHLAWQ5bjHsOGiTmkwiRtZMULZlUzh5wm 94n6riOm2uyAmo+Vn5vuw3ArO6fjqHEEwA== X-Google-Smtp-Source: ABdhPJy/3oxtVhlqdyaSwz7xtyfdDuDHCJ5pyzrgHOu0D0ZtnBlA1gbHeUwIBSt14u+s2g73xXEjEQ== X-Received: by 2002:adf:bc54:: with SMTP id a20mr6616937wrh.227.1596707958481; Thu, 06 Aug 2020 02:59:18 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b139sm6206250wmd.19.2020.08.06.02.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:59:17 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Qi Zhang , dpdk stable Date: Thu, 6 Aug 2020 10:54:00 +0100 Message-Id: <20200806095411.774624-32-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: add memory allocation check in RSS init' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 4180d0e9e07078f0d9f3c03e128ee4fda1e2658e Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 28 Jul 2020 21:11:27 +0800 Subject: [PATCH] net/ice: add memory allocation check in RSS init [ upstream commit e40a84ebedf3d8f6ea00f6c10d0fc885a8163d43 ] The function rte_zmalloc() could return NULL, the return value need to be checked. Fixes: 50370662b727 ("net/ice: support device and queue ops") Signed-off-by: Yunjian Wang Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 34ca161e5..cb71d7bfd 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -2464,13 +2464,24 @@ static int ice_init_rss(struct ice_pf *pf) return 0; } - if (!vsi->rss_key) + if (!vsi->rss_key) { vsi->rss_key = rte_zmalloc(NULL, vsi->rss_key_size, 0); - if (!vsi->rss_lut) + if (vsi->rss_key == NULL) { + PMD_DRV_LOG(ERR, "Failed to allocate memory for rss_key"); + return -ENOMEM; + } + } + if (!vsi->rss_lut) { vsi->rss_lut = rte_zmalloc(NULL, vsi->rss_lut_size, 0); - + if (vsi->rss_lut == NULL) { + PMD_DRV_LOG(ERR, "Failed to allocate memory for rss_key"); + rte_free(vsi->rss_key); + vsi->rss_key = NULL; + return -ENOMEM; + } + } /* configure RSS key */ if (!rss_conf->rss_key) { /* Calculate the default hash key */ @@ -2484,7 +2495,7 @@ static int ice_init_rss(struct ice_pf *pf) rte_memcpy(key.standard_rss_key, vsi->rss_key, vsi->rss_key_size); ret = ice_aq_set_rss_key(hw, vsi->idx, &key); if (ret) - return -EINVAL; + goto out; /* init RSS LUT table */ for (i = 0; i < vsi->rss_lut_size; i++) @@ -2494,7 +2505,7 @@ static int ice_init_rss(struct ice_pf *pf) ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF, vsi->rss_lut, vsi->rss_lut_size); if (ret) - return -EINVAL; + goto out; /* Enable registers for symmetric_toeplitz function. */ reg = ICE_READ_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id)); @@ -2570,6 +2581,12 @@ static int ice_init_rss(struct ice_pf *pf) __func__, ret); return 0; +out: + rte_free(vsi->rss_key); + vsi->rss_key = NULL; + rte_free(vsi->rss_lut); + vsi->rss_lut = NULL; + return -EINVAL; } static int -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:17.033766142 +0100 +++ 0032-net-ice-add-memory-allocation-check-in-RSS-init.patch 2020-08-06 10:53:15.824597876 +0100 @@ -1,13 +1,14 @@ -From e40a84ebedf3d8f6ea00f6c10d0fc885a8163d43 Mon Sep 17 00:00:00 2001 +From 4180d0e9e07078f0d9f3c03e128ee4fda1e2658e Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 28 Jul 2020 21:11:27 +0800 Subject: [PATCH] net/ice: add memory allocation check in RSS init +[ upstream commit e40a84ebedf3d8f6ea00f6c10d0fc885a8163d43 ] + The function rte_zmalloc() could return NULL, the return value need to be checked. Fixes: 50370662b727 ("net/ice: support device and queue ops") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Qi Zhang @@ -16,10 +17,10 @@ 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c -index a29c9addc..84a0d8e0b 100644 +index 34ca161e5..cb71d7bfd 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c -@@ -2707,13 +2707,24 @@ static int ice_init_rss(struct ice_pf *pf) +@@ -2464,13 +2464,24 @@ static int ice_init_rss(struct ice_pf *pf) return 0; } @@ -47,7 +48,7 @@ /* configure RSS key */ if (!rss_conf->rss_key) { /* Calculate the default hash key */ -@@ -2727,7 +2738,7 @@ static int ice_init_rss(struct ice_pf *pf) +@@ -2484,7 +2495,7 @@ static int ice_init_rss(struct ice_pf *pf) rte_memcpy(key.standard_rss_key, vsi->rss_key, vsi->rss_key_size); ret = ice_aq_set_rss_key(hw, vsi->idx, &key); if (ret) @@ -56,7 +57,7 @@ /* init RSS LUT table */ for (i = 0; i < vsi->rss_lut_size; i++) -@@ -2737,7 +2748,7 @@ static int ice_init_rss(struct ice_pf *pf) +@@ -2494,7 +2505,7 @@ static int ice_init_rss(struct ice_pf *pf) ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF, vsi->rss_lut, vsi->rss_lut_size); if (ret) @@ -65,8 +66,8 @@ /* Enable registers for symmetric_toeplitz function. */ reg = ICE_READ_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id)); -@@ -2749,6 +2760,12 @@ static int ice_init_rss(struct ice_pf *pf) - ice_rss_hash_set(pf, rss_conf->rss_hf); +@@ -2570,6 +2581,12 @@ static int ice_init_rss(struct ice_pf *pf) + __func__, ret); return 0; +out: