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 18D56A04DD for ; Wed, 28 Oct 2020 11:46:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 258D5CA36; Wed, 28 Oct 2020 11:46:37 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 310E9CA36 for ; Wed, 28 Oct 2020 11:46:35 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id a9so1328749wrg.12 for ; Wed, 28 Oct 2020 03:46:35 -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=EdEkoDvs2beQuOAUUl2a5O0osLOgIMgHYYn2Ch5CoFM=; b=n4eRtRBa9mBu1P6a0PljkYtfoal9dwJbAsJRTHqeRdACa7pByqFF7bofJ1LoAO5Nlk kQxClmRrdSAdjqF2Y7MepVQJbHEXrEm0GEOX1WZ6EIqp8qX1oh8zVXv7W3yZiDqbgwly CKcPe5wmeArPTqMdici7GmdjfmXD2Ha9d9o9hIw+/ujwY8hLV+J0WwfXVlf7A+/x/nz5 T+0ccSGQWmhOIfjmgS4xN9HFz/Ar3PhJfvck1gNrlGbQ0Nl5dE/gvJqHPMPUuTpEtz/k ubxQZEoEqBZJVarBwgcSWPBPnxDiO2ht90K2j87Tr1NPTd6Cpas2yHKqPINSA3UeTuG9 Q0Kw== 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=EdEkoDvs2beQuOAUUl2a5O0osLOgIMgHYYn2Ch5CoFM=; b=FDvDmWQGdD49BoRwXQ1H0QCJsJJTvTD4rQmOBx0/4Fj7yY7FXhpB7cadY6uI0HPgOD On0P3NInCrjL/LsbmNhxHsLygpZdlm+BK8ZxeCuxde4SrJxY5DTZAELvCv0nKydpzegU PzPBYogNBfWPoD4xQy1vigxExmcu1VeIpDmfNL1TqPtXkWG+pe1TgFvNSJBR9x97s1pq 7iRvw6+5X8WJFOCf/6XHnmGyYtyfGAathEa7djhRkZ5Db9Wr5mvfA1SGryC6YUtj6/Kp vNKg02ZbpEPyugCho6Nuoq34uggY7f7LnL64dnQ4HIdWuA9ltJlEK/dif3BJfNusdmYj QaQQ== X-Gm-Message-State: AOAM530mO38zqbIB7Ff4MWyRbqOL/7X2pfr+EOZ/+fDAOHkmEOjC2fc2 glm7R00CWUtpKF5bRKQJ/BI= X-Google-Smtp-Source: ABdhPJxhqn0wMYAxCvItwEd7Dxja5NYe8qL1v+oQCe3u/L9P3mabt1NY/YLvnqqBayBTGm8NdwrknA== X-Received: by 2002:a5d:66cc:: with SMTP id k12mr7757991wrw.47.1603881993910; Wed, 28 Oct 2020 03:46:33 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e25sm4896663wrc.76.2020.10.28.03.46.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:46:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Ajit Khaparde , dpdk stable Date: Wed, 28 Oct 2020 10:42:49 +0000 Message-Id: <20201028104606.3504127-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: add memory allocation check in VF info init' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 fd2313c1bcc695f11b4c41ba76c96b6efc9a118a Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 31 Jul 2020 20:09:06 +0800 Subject: [PATCH] net/bnxt: add memory allocation check in VF info init [ upstream commit 2477be96e7a34ee74314d2604b4943b5e317e627 ] The function rte_malloc() could return NULL, the return value need to be checked. Fixes: b7778e8a1c00 ("net/bnxt: refactor to properly allocate resources for PF/VF") Signed-off-by: Yunjian Wang Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index fed1aa3297..15ec7248c2 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -613,8 +613,12 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) if (new_max_vfs != bp->pf.max_vfs) { if (bp->pf.vf_info) rte_free(bp->pf.vf_info); - bp->pf.vf_info = rte_malloc("bnxt_vf_info", + bp->pf.vf_info = rte_zmalloc("bnxt_vf_info", sizeof(bp->pf.vf_info[0]) * new_max_vfs, 0); + if (bp->pf.vf_info == NULL) { + PMD_DRV_LOG(ERR, "Alloc vf info fail\n"); + return -ENOMEM; + } bp->pf.max_vfs = new_max_vfs; for (i = 0; i < new_max_vfs; i++) { bp->pf.vf_info[i].fid = bp->pf.first_vf_id + i; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.098747169 +0000 +++ 0010-net-bnxt-add-memory-allocation-check-in-VF-info-init.patch 2020-10-28 10:35:11.404828552 +0000 @@ -1,13 +1,14 @@ -From 2477be96e7a34ee74314d2604b4943b5e317e627 Mon Sep 17 00:00:00 2001 +From fd2313c1bcc695f11b4c41ba76c96b6efc9a118a Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Fri, 31 Jul 2020 20:09:06 +0800 Subject: [PATCH] net/bnxt: add memory allocation check in VF info init +[ upstream commit 2477be96e7a34ee74314d2604b4943b5e317e627 ] + The function rte_malloc() could return NULL, the return value need to be checked. Fixes: b7778e8a1c00 ("net/bnxt: refactor to properly allocate resources for PF/VF") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Reviewed-by: Ajit Khaparde @@ -16,23 +17,23 @@ 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c -index 643dd98977..43e3e27537 100644 +index fed1aa3297..15ec7248c2 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c -@@ -711,8 +711,12 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) - if (new_max_vfs != bp->pf->max_vfs) { - if (bp->pf->vf_info) - bnxt_hwrm_free_vf_info(bp); -- bp->pf->vf_info = rte_malloc("bnxt_vf_info", -+ bp->pf->vf_info = rte_zmalloc("bnxt_vf_info", - sizeof(bp->pf->vf_info[0]) * new_max_vfs, 0); -+ if (bp->pf->vf_info == NULL) { +@@ -613,8 +613,12 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) + if (new_max_vfs != bp->pf.max_vfs) { + if (bp->pf.vf_info) + rte_free(bp->pf.vf_info); +- bp->pf.vf_info = rte_malloc("bnxt_vf_info", ++ bp->pf.vf_info = rte_zmalloc("bnxt_vf_info", + sizeof(bp->pf.vf_info[0]) * new_max_vfs, 0); ++ if (bp->pf.vf_info == NULL) { + PMD_DRV_LOG(ERR, "Alloc vf info fail\n"); + return -ENOMEM; + } - bp->pf->max_vfs = new_max_vfs; + bp->pf.max_vfs = new_max_vfs; for (i = 0; i < new_max_vfs; i++) { - bp->pf->vf_info[i].fid = + bp->pf.vf_info[i].fid = bp->pf.first_vf_id + i; -- 2.20.1