From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B1C69A0543 for ; Sat, 5 Nov 2022 18:11:54 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC7964067C; Sat, 5 Nov 2022 18:11:54 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 49EFE400D5 for ; Sat, 5 Nov 2022 18:11:53 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id a14so10882840wru.5 for ; Sat, 05 Nov 2022 10:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xwhtoJw++W6+aKvY+sjHMAuVdxlqIX26u5rbwsMV+2w=; b=OAamLvfrxUQdJtEZA9Kq4d369qevUUJTAxdzlNfooPA50Lfulw6c7GB4teF6YJjNUm 5sCXOMZLT4MMKYpYqMwDkEG3XaCDJ1MMWFKlPgg3TDOAQN+tfKJrhI0+/+EA/jyiUOAO 2CWTnM5wkaxFTiQCTKUHsRl98yFJ4SY81yFUw5sAH8uMP2vMhOeeOX4HyjKsMqrl5nFk Lp46GE9lY/K5H53jzASIiZkV6LbfV5qAQ7P+KlQH2UDZCtB/DB1AXx+qdcMoTMTdI1oh allqC59TKuCObcF5rgOKQUnqeCwfFSTKxnoOx/GylRXAOQe2i9pYR/yYBWD5t7jT9irC 992Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xwhtoJw++W6+aKvY+sjHMAuVdxlqIX26u5rbwsMV+2w=; b=ohrKjkkZx/6e4SkgHPdQpWah9cla9CF2zXw6JgG1iSCouTT/Gnu2tN79/sb9C4RhRc gF2aCUWJfX1GFTpwW/1wevjKqQ69fFdI5MAUow8Xw9Qh8hDRfWUNFDNfVoL1ywwKnIpg zQlaOSLp8z3tgZ58MPdEAcfe0oQoWqnpaNto2REAo6tdhq5yN170k1wLPE+YAcppSzwX iEWue+OHqTAJ2T8ZkvyMFYLUECiRhtlegW8iJhNJpaf6eM2E2VzoC/EIkdnhYiyUVG6w JlS+kCAU7guoOsjCVeaRXjMnAYxR+W9A+YAKUScxZsbFACs+0OEaOn9Uh5R+tNOhpgwk 0Lmw== X-Gm-Message-State: ACrzQf2Apsh7u2ZbSsDTGkgc70qG6HM0qHLdQOOb1f3/pr9P2u+M6fh4 MZCFSElk06Ov7z+HlkygaeE= X-Google-Smtp-Source: AMsMyM6ppM5BjxEX02EGkX8cdI47dC1ey0bWh86BwX81kplQ0g722FWEpsqhBw9iXxB57Jha+KMsuQ== X-Received: by 2002:adf:db10:0:b0:231:bcaa:313b with SMTP id s16-20020adfdb10000000b00231bcaa313bmr24640296wri.142.1667668312972; Sat, 05 Nov 2022 10:11:52 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id u13-20020a5d434d000000b0023647841c5bsm2590788wrr.60.2022.11.05.10.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:11:52 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Jerin Jacob , Sunil Kumar Kori , dpdk stable Subject: patch 'trace: fix leak with regexp' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:02 +0000 Message-Id: <20221105171146.1520039-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 20.11.7 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/07/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/207496d05733265802965e2f80419d884aa3a905 Thanks. Luca Boccassi --- >From 207496d05733265802965e2f80419d884aa3a905 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 14 Sep 2022 16:36:36 +0200 Subject: [PATCH] trace: fix leak with regexp [ upstream commit b980ced067d226d9f43d0c77bf07b6e6bd78f166 ] The precompiled buffer initialised in regcomp must be freed before leaving rte_trace_regexp. Fixes: 84c4fae4628f ("trace: implement operation APIs") Signed-off-by: David Marchand Acked-by: Jerin Jacob Acked-by: Sunil Kumar Kori --- lib/librte_eal/common/eal_common_trace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c index 3f4b5c5876..22b7fcd33b 100644 --- a/lib/librte_eal/common/eal_common_trace.c +++ b/lib/librte_eal/common/eal_common_trace.c @@ -218,8 +218,10 @@ rte_trace_regexp(const char *regex, bool enable) rc = rte_trace_point_disable(tp->handle); found = 1; } - if (rc < 0) - return rc; + if (rc < 0) { + found = 0; + break; + } } regfree(&r); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:09.065718137 +0000 +++ 0003-trace-fix-leak-with-regexp.patch 2022-11-05 17:11:08.558940152 +0000 @@ -1 +1 @@ -From b980ced067d226d9f43d0c77bf07b6e6bd78f166 Mon Sep 17 00:00:00 2001 +From 207496d05733265802965e2f80419d884aa3a905 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b980ced067d226d9f43d0c77bf07b6e6bd78f166 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/eal/common/eal_common_trace.c | 6 ++++-- + lib/librte_eal/common/eal_common_trace.c | 6 ++++-- @@ -19,4 +20,4 @@ -diff --git a/lib/eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c -index 1b86f5d2d2..1db11e3e14 100644 ---- a/lib/eal/common/eal_common_trace.c -+++ b/lib/eal/common/eal_common_trace.c +diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c +index 3f4b5c5876..22b7fcd33b 100644 +--- a/lib/librte_eal/common/eal_common_trace.c ++++ b/lib/librte_eal/common/eal_common_trace.c