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 E3BD51B489 for ; Fri, 4 Jan 2019 14:27:09 +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 4C54D81E05; Fri, 4 Jan 2019 13:27:09 +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 CF0155C22F; Fri, 4 Jan 2019 13:27:07 +0000 (UTC) From: Kevin Traynor To: Gao Feng Cc: Anatoly Burakov , dpdk stable Date: Fri, 4 Jan 2019 13:24:10 +0000 Message-Id: <20190104132455.15170-28-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.25]); Fri, 04 Jan 2019 13:27:09 +0000 (UTC) Subject: [dpdk-stable] patch 'eal: fix leak on multi-process request error' 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:27:10 -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 08eb5669bf91a89e1ed0138e4de012f32dabad5b Mon Sep 17 00:00:00 2001 From: Gao Feng Date: Wed, 5 Dec 2018 10:50:25 +0800 Subject: [PATCH] eal: fix leak on multi-process request error [ upstream commit e14bc93e8f231455ac7ffb45189f8dedcc45276d ] When rte_eal_alarm_set failed, need to free the bundle mem in the error handler of handle_primary_request and handle_secondary_request. Fixes: 244d5130719c ("eal: enable hotplug on multi-process") Fixes: ac9e4a17370f ("eal: support attach/detach shared device from secondary") Signed-off-by: Gao Feng Acked-by: Anatoly Burakov --- lib/librte_eal/common/hotplug_mp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/librte_eal/common/hotplug_mp.c b/lib/librte_eal/common/hotplug_mp.c index 070e2e0c2..9d610a8a2 100644 --- a/lib/librte_eal/common/hotplug_mp.c +++ b/lib/librte_eal/common/hotplug_mp.c @@ -209,4 +209,6 @@ handle_secondary_request(const struct rte_mp_msg *msg, const void *peer) if (ret != 0) { RTE_LOG(ERR, EAL, "failed to add mp task\n"); + free(bundle->peer); + free(bundle); return send_response_to_secondary(req, ret, peer); } @@ -333,4 +335,6 @@ handle_primary_request(const struct rte_mp_msg *msg, const void *peer) ret = rte_eal_alarm_set(1, __handle_primary_request, bundle); if (ret != 0) { + free(bundle->peer); + free(bundle); resp->result = ret; ret = rte_mp_reply(&mp_resp, peer); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:08.119461650 +0000 +++ 0028-eal-fix-leak-on-multi-process-request-error.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,14 +1,15 @@ -From e14bc93e8f231455ac7ffb45189f8dedcc45276d Mon Sep 17 00:00:00 2001 +From 08eb5669bf91a89e1ed0138e4de012f32dabad5b Mon Sep 17 00:00:00 2001 From: Gao Feng Date: Wed, 5 Dec 2018 10:50:25 +0800 Subject: [PATCH] eal: fix leak on multi-process request error +[ upstream commit e14bc93e8f231455ac7ffb45189f8dedcc45276d ] + When rte_eal_alarm_set failed, need to free the bundle mem in the error handler of handle_primary_request and handle_secondary_request. Fixes: 244d5130719c ("eal: enable hotplug on multi-process") Fixes: ac9e4a17370f ("eal: support attach/detach shared device from secondary") -Cc: stable@dpdk.org Signed-off-by: Gao Feng Acked-by: Anatoly Burakov