From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 35DC81B287 for ; Mon, 30 Oct 2017 16:36:12 +0100 (CET) Received: by mail-wm0-f68.google.com with SMTP id z3so17286069wme.5 for ; Mon, 30 Oct 2017 08:36:12 -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; bh=aKmOsSF4qN08LgwDdYxVir/559HyJ/aOTTkMfJyI7mI=; b=eRSFDPafFbdhC5WfpWLTu7OfOpItNIFGiUIhnkAldet0DSFGS7/z6Id3l37zn4bkUD xICBoI3l1ei0+Xm2L0dwd5svijA1aUO285suvGnLEwgLUjclfKJBf6nj/cvbguigmKBa srYiseD9jRYTfEPtqL1TJGowew6dBrnAJZr1Pri7uM+qCtlGqZgaeAHSI4L2FzIfkckT ZwCczaWvkCeDgdcUMg6/RMF2Ra8B/QjTmZ/8W6BqMSNEfOZB3NUcb3iGAupWMCCyQ0R9 KTKIoDHg0M6wal0xa8CvXPvLhXCn3poSON/ei166aBmBlNPZ8s/+cK3KdHoVuuqocCjA jizQ== 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; bh=aKmOsSF4qN08LgwDdYxVir/559HyJ/aOTTkMfJyI7mI=; b=rQJOIp5E9mu3JxmK020sBVLEoYqM9PUjZ423eJsDRGw2zPvgtorOn0s8fWk6xAtIKX T7fgjG2KaVn1d88wC+PjagrXSQMwO93DWqHrvCGN85k1n7pScv5fZj1PaKRShY8SCKqb /RkuveVsMzk2IIRCqspIP4DddwVTeK5LkgyZYl7bBw5hKParI3hEgmrFrp/y9iMj0Voq nUlu4xfIFqBoODygIfIYiLyaDyfC77r5XTrJ3vM8eu8Y3yQYMxW0lk8E9N05On2py8Y5 4crhaH463Shp9PN1tqnESPNEagqngzYW08JaOiNJYCwUaJ+V4SXHfjyef01c7XVkXH/L 9NAg== X-Gm-Message-State: AMCzsaW6rvmD0oT7LPRxcYFNJ3J3mTX4z1MPTfwdVFq3EPbcl+zC15jY XEIT7a+IfNLmKeEYy5JQ1BM= X-Google-Smtp-Source: ABhQp+SkM+xinRR2Lp316Ranz8bUe2BEK+aA69D11XkGViVLhfTpYUcfW14TtK+fgVE3AygolirPEQ== X-Received: by 10.28.17.7 with SMTP id 7mr3933153wmr.66.1509377771901; Mon, 30 Oct 2017 08:36:11 -0700 (PDT) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id x23sm3655710wmc.31.2017.10.30.08.36.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Oct 2017 08:36:11 -0700 (PDT) From: luca.boccassi@gmail.com To: Jingjing Wu Cc: Beilei Xing , dpdk stable Date: Mon, 30 Oct 2017 15:34:19 +0000 Message-Id: <20171030153511.13322-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171030153511.13322-1-luca.boccassi@gmail.com> References: <20171030153511.13322-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/i40e: fix memory leak if VF init fails' has been queued to LTS release 16.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: , X-List-Received-Date: Mon, 30 Oct 2017 15:36:12 -0000 Hi, FYI, your patch has been queued to LTS release 16.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 11/01/17. So please shout if anyone has objections. Thanks. Kind regards, Luca Boccassi --- >>From 25a003fe08834d87c81bc2e8e4b82dac53b43336 Mon Sep 17 00:00:00 2001 From: Jingjing Wu Date: Wed, 13 Sep 2017 07:54:23 +0800 Subject: [PATCH] net/i40e: fix memory leak if VF init fails [ upstream commit d031bff503bac11d8cefed90154441a4bc577d36 ] Fixes: 4861cde46116 ("i40e: new poll mode driver") Signed-off-by: Jingjing Wu Acked-by: Beilei Xing --- drivers/net/i40e/i40e_ethdev_vf.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index efd4fac11..0f2f23c05 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1210,29 +1210,29 @@ i40evf_init_vf(struct rte_eth_dev *dev) /* VF reset, shutdown admin queue and initialize again */ if (i40e_shutdown_adminq(hw) != I40E_SUCCESS) { PMD_INIT_LOG(ERR, "i40e_shutdown_adminq failed"); - return -1; + goto err; } i40e_init_adminq_parameter(hw); if (i40e_init_adminq(hw) != I40E_SUCCESS) { PMD_INIT_LOG(ERR, "init_adminq failed"); - return -1; + goto err; } vf->aq_resp = rte_zmalloc("vf_aq_resp", I40E_AQ_BUF_SZ, 0); if (!vf->aq_resp) { PMD_INIT_LOG(ERR, "unable to allocate vf_aq_resp memory"); - goto err_aq; + goto err_aq; } if (i40evf_check_api_version(dev) != 0) { PMD_INIT_LOG(ERR, "check_api version failed"); - goto err_aq; + goto err_api; } bufsz = sizeof(struct i40e_virtchnl_vf_resource) + (I40E_MAX_VF_VSI * sizeof(struct i40e_virtchnl_vsi_resource)); vf->vf_res = rte_zmalloc("vf_res", bufsz, 0); if (!vf->vf_res) { PMD_INIT_LOG(ERR, "unable to allocate vf_res memory"); - goto err_aq; + goto err_api; } if (i40evf_get_vf_resource(dev) != 0) { @@ -1279,6 +1279,9 @@ i40evf_init_vf(struct rte_eth_dev *dev) err_alloc: rte_free(vf->vf_res); + vf->vsi_res = NULL; +err_api: + rte_free(vf->aq_resp); err_aq: i40e_shutdown_adminq(hw); /* ignore error */ err: -- 2.11.0