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 ED4B5A0C47 for ; Tue, 10 Aug 2021 17:41:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E738F4114F; Tue, 10 Aug 2021 17:41:23 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 4646B4014F for ; Tue, 10 Aug 2021 17:41:22 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 2EE8E3F0A1 for ; Tue, 10 Aug 2021 15:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610082; bh=M9kWwD50+WawT/urT4fAMave8+ZcHOctTzuT5ZViZm0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=u7SOD6s3mrW0lKdH9RwBLpTfCsJPcMUynDxe68jumCM/58zzXJONoMImSsEmnUOM7 Rpfk4V5pVtMfLXX5dXwYnIhoIShoh2mU9VFnOSjY9okrl13Uy/PDhVfSJGX1Ja1l1T 7R8+z6kx1+uHRfj2xe4DPTJ0VEld6zF0GGGm+73RCFDOeE5vVlm0BQud6fUYoKrHnd a6IuFOiYbrKSMgZDIwRi3OdDAMdCRzb+BtegvEPKtJY1OQTAffRgIrJt0Y2gDSTP1v mHBHkKGNO5Wj82Z5eDD7EJlWcQ2wlinJ0Nm5IzBqTkenRjX0b5B0Yvu5gWlPPi5M4I cTuTjfPLa6yuQ== Received: by mail-ed1-f70.google.com with SMTP id c1-20020aa7df010000b02903bb5c6f746eso10884407edy.10 for ; Tue, 10 Aug 2021 08:41:22 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=M9kWwD50+WawT/urT4fAMave8+ZcHOctTzuT5ZViZm0=; b=o8LjjfdV1vn4ZT+lhOC4rhGYFzNfTOk6OQ2Y4UWwYDR/MFaH3e6CfLTY/04dVxdrIc jIAsM33iiD9QGdXYgB2BlyvaxETkMh/S9gz9AHe/47sS6cN2VZyPx1Cpa23hM0i7uj5U TJWGS9weeLxDf78mQwBbG1X/nuZGU0ueHnIBzaPvkx+qyqSqMg9P6GHRB2jjwoHyt6SM jCTXCsndaR/HPsgKpHsaa+/hVdE5j8heV3pNW2zLl/Weqb8IdiimCp2Y2mu7duErPdkP YQ0fdX2NmLQy6bRftaxG8VkR+Hhbhl4JS4gfOKINlHPJNBBI+yOK7jSJpAyfG0I61TN8 34Kg== X-Gm-Message-State: AOAM531BKJCTWMEg9Vl16m8l+C4jwlJyojfB1C+ctyFyK01cYDKXvGe5 UEtLeBHdJY0nef6YJrNmjHFGqd+fwjIx1Jm+KUujR5QDDj2hzm18Gcsq5y8Yaf+VmuBr2YXHsgP 7DkRunBLywKkVyTuko0RAhLr8 X-Received: by 2002:a17:906:1c81:: with SMTP id g1mr28818143ejh.361.1628610081916; Tue, 10 Aug 2021 08:41:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxv23IoHLC/dMWdnR/Mu2khY8zJtRamf1hpICnLsSyHHW+aaJm2IDB09j7lZqRxZYhqJGrUnA== X-Received: by 2002:a17:906:1c81:: with SMTP id g1mr28818127ejh.361.1628610081736; Tue, 10 Aug 2021 08:41:21 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id dt2sm2452535ejc.51.2021.08.10.08.41.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:41:21 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Owen Hilyard Cc: Bernard Iremonger , dpdk stable Date: Tue, 10 Aug 2021 17:38:57 +0200 Message-Id: <20210810154022.749358-17-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'flow_classify: fix leaking rules on delete' has been queued to stable release 19.11.10 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/0c6d3c0f8d17aa8da850dcc695aefc037152c11f Thanks. Christian Ehrhardt --- >From 0c6d3c0f8d17aa8da850dcc695aefc037152c11f Mon Sep 17 00:00:00 2001 From: Owen Hilyard Date: Wed, 23 Jun 2021 13:07:07 -0400 Subject: [PATCH] flow_classify: fix leaking rules on delete [ upstream commit 016441e3c770b65774d658c94a82c5bf5ed826fe ] Rules in a classify table were not freed if the table had a delete function. Fixes: be41ac2a330f ("flow_classify: introduce flow classify library") Signed-off-by: Owen Hilyard Acked-by: Bernard Iremonger --- lib/librte_flow_classify/rte_flow_classify.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_flow_classify/rte_flow_classify.c b/lib/librte_flow_classify/rte_flow_classify.c index 5ff585803b..c7c57e17b6 100644 --- a/lib/librte_flow_classify/rte_flow_classify.c +++ b/lib/librte_flow_classify/rte_flow_classify.c @@ -584,12 +584,12 @@ rte_flow_classify_table_entry_delete(struct rte_flow_classifier *cls, &rule->u.key.key_del, &rule->key_found, &rule->entry); - + if (ret == 0) + free(rule); return ret; } } } - free(rule); return ret; } -- 2.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:13.745844069 +0200 +++ 0017-flow_classify-fix-leaking-rules-on-delete.patch 2021-08-10 15:11:12.918637378 +0200 @@ -1 +1 @@ -From 016441e3c770b65774d658c94a82c5bf5ed826fe Mon Sep 17 00:00:00 2001 +From 0c6d3c0f8d17aa8da850dcc695aefc037152c11f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 016441e3c770b65774d658c94a82c5bf5ed826fe ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +16 @@ - lib/flow_classify/rte_flow_classify.c | 4 ++-- + lib/librte_flow_classify/rte_flow_classify.c | 4 ++-- @@ -18,5 +19,5 @@ -diff --git a/lib/flow_classify/rte_flow_classify.c b/lib/flow_classify/rte_flow_classify.c -index f125267e8f..d3ba2ed227 100644 ---- a/lib/flow_classify/rte_flow_classify.c -+++ b/lib/flow_classify/rte_flow_classify.c -@@ -579,12 +579,12 @@ rte_flow_classify_table_entry_delete(struct rte_flow_classifier *cls, +diff --git a/lib/librte_flow_classify/rte_flow_classify.c b/lib/librte_flow_classify/rte_flow_classify.c +index 5ff585803b..c7c57e17b6 100644 +--- a/lib/librte_flow_classify/rte_flow_classify.c ++++ b/lib/librte_flow_classify/rte_flow_classify.c +@@ -584,12 +584,12 @@ rte_flow_classify_table_entry_delete(struct rte_flow_classifier *cls,