From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 3C4AF1B49C for ; Fri, 4 Jan 2019 14:28:46 +0100 (CET) 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 mx1.redhat.com (Postfix) with ESMTPS id A31237518D; Fri, 4 Jan 2019 13:28:45 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7830A5C1A1; Fri, 4 Jan 2019 13:28:44 +0000 (UTC) From: Kevin Traynor To: Tonghao Zhang Cc: dpdk stable Date: Fri, 4 Jan 2019 13:24:54 +0000 Message-Id: <20190104132455.15170-72-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 04 Jan 2019 13:28:45 +0000 (UTC) Subject: [dpdk-stable] patch 'sched: fix memory leak on init failure' has been queued to LTS release 18.11.1 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: Fri, 04 Jan 2019 13:28:46 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/11/19. 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. Kevin Traynor --- >>From b6cd764c39521574e7914aa72fba774dc7c6ea32 Mon Sep 17 00:00:00 2001 From: Tonghao Zhang Date: Wed, 28 Nov 2018 05:55:55 -0800 Subject: [PATCH] sched: fix memory leak on init failure [ upstream commit 03b7fd7e545f453f1d7c13d11bf8a0b7cd59a943 ] In some case, we may create sched port dynamically, if err when creating so memory will leak. Fixes: de3cfa2c9823 ("sched: initial import") Signed-off-by: Tonghao Zhang --- lib/librte_sched/rte_sched.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c index 587d5e602..89c3d1e7f 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -668,4 +668,5 @@ rte_sched_port_config(struct rte_sched_port_params *params) params->red_params[i][j].max_th, params->red_params[i][j].maxp_inv) != 0) { + rte_free(port); return NULL; } @@ -727,4 +728,5 @@ rte_sched_port_config(struct rte_sched_port_params *params) if (port->bmp == NULL) { RTE_LOG(ERR, SCHED, "Bitmap init error\n"); + rte_free(port); return NULL; } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:09.197144153 +0000 +++ 0072-sched-fix-memory-leak-on-init-failure.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,13 +1,14 @@ -From 03b7fd7e545f453f1d7c13d11bf8a0b7cd59a943 Mon Sep 17 00:00:00 2001 +From b6cd764c39521574e7914aa72fba774dc7c6ea32 Mon Sep 17 00:00:00 2001 From: Tonghao Zhang Date: Wed, 28 Nov 2018 05:55:55 -0800 Subject: [PATCH] sched: fix memory leak on init failure +[ upstream commit 03b7fd7e545f453f1d7c13d11bf8a0b7cd59a943 ] + In some case, we may create sched port dynamically, if err when creating so memory will leak. Fixes: de3cfa2c9823 ("sched: initial import") -Cc: stable@dpdk.org Signed-off-by: Tonghao Zhang --- @@ -15,16 +16,16 @@ 1 file changed, 2 insertions(+) diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c -index dd7739172..77aed9fb2 100644 +index 587d5e602..89c3d1e7f 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c -@@ -655,4 +655,5 @@ rte_sched_port_config(struct rte_sched_port_params *params) +@@ -668,4 +668,5 @@ rte_sched_port_config(struct rte_sched_port_params *params) params->red_params[i][j].max_th, params->red_params[i][j].maxp_inv) != 0) { + rte_free(port); return NULL; } -@@ -714,4 +715,5 @@ rte_sched_port_config(struct rte_sched_port_params *params) +@@ -727,4 +728,5 @@ rte_sched_port_config(struct rte_sched_port_params *params) if (port->bmp == NULL) { RTE_LOG(ERR, SCHED, "Bitmap init error\n"); + rte_free(port);