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 091C8A04DD for ; Wed, 18 Nov 2020 17:38:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 88571C922; Wed, 18 Nov 2020 17:38:24 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 0F6B5C922 for ; Wed, 18 Nov 2020 17:38:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kteRxk24uLvsLLwcxzIWHLfQ8MFNo4xB8p8XkQP8CuY=; b=JC4jFwazWe7Os6fVbVWHqRxRySQapPtSP78AXMtpFNVfRXIodupfaRi6Ai3UGXt2r8RRmd 87P4vLmjYJf4qifaFizDEwmubAZvF7thvod3c1e/wuXOHjQCoWeOL1a8ivbYuZ7hbAfqMt XGa+3iWcdVOxzmk0X4w25v/yajpQdos= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-589-ZwCZsJEpOJ6G4bObLHdVcw-1; Wed, 18 Nov 2020 11:38:18 -0500 X-MC-Unique: ZwCZsJEpOJ6G4bObLHdVcw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD96D8143EF; Wed, 18 Nov 2020 16:38:16 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FA105C1A3; Wed, 18 Nov 2020 16:38:15 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Liron Himi , dpdk stable Date: Wed, 18 Nov 2020 16:35:47 +0000 Message-Id: <20201118163558.1101823-61-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/mvpp2: fix memory leak in error path' has been queued to LTS release 18.11.11 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 LTS release 18.11.11 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/24/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/bc7fd1289fc55b5a6170db1cc572b94eee1c9f7d Thanks. Kevin. --- >From bc7fd1289fc55b5a6170db1cc572b94eee1c9f7d Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 22 Oct 2020 12:25:27 +0800 Subject: [PATCH] net/mvpp2: fix memory leak in error path [ upstream commit 1b2c17d60d978d2570baa9e5c478ebca1fce3859 ] In mrvl_create() allocated memory for 'mtr', we don't free it when profile get fails and it will lead to memory leak. We can get profile at the beginning of the function to fix it, before calling mtr = rte_zmalloc_socket(). Fixes: cdb53f8da628 ("net/mvpp2: support metering") Signed-off-by: Yunjian Wang Acked-by: Liron Himi --- drivers/net/mvpp2/mrvl_mtr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_mtr.c b/drivers/net/mvpp2/mrvl_mtr.c index 39272acea4..2fa5cb43ad 100644 --- a/drivers/net/mvpp2/mrvl_mtr.c +++ b/drivers/net/mvpp2/mrvl_mtr.c @@ -330,4 +330,10 @@ mrvl_create(struct rte_eth_dev *dev, uint32_t mtr_id, struct mrvl_mtr *mtr; + profile = mrvl_mtr_profile_from_id(priv, params->meter_profile_id); + if (!profile) + return -rte_mtr_error_set(error, EINVAL, + RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, + NULL, "Profile id does not exist\n"); + mtr = mrvl_mtr_from_id(priv, mtr_id); if (mtr) @@ -342,10 +348,4 @@ mrvl_create(struct rte_eth_dev *dev, uint32_t mtr_id, NULL, NULL); - profile = mrvl_mtr_profile_from_id(priv, params->meter_profile_id); - if (!profile) - return -rte_mtr_error_set(error, EINVAL, - RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, - NULL, "Profile id does not exist\n"); - mtr->shared = shared; mtr->mtr_id = mtr_id; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:39.081393681 +0000 +++ 0061-net-mvpp2-fix-memory-leak-in-error-path.patch 2020-11-18 16:33:37.984215097 +0000 @@ -1 +1 @@ -From 1b2c17d60d978d2570baa9e5c478ebca1fce3859 Mon Sep 17 00:00:00 2001 +From bc7fd1289fc55b5a6170db1cc572b94eee1c9f7d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1b2c17d60d978d2570baa9e5c478ebca1fce3859 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org