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 E40E4A0C4C for ; Mon, 12 Jul 2021 15:11:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DF04A4069D; Mon, 12 Jul 2021 15:11:50 +0200 (CEST) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 8C4624069D for ; Mon, 12 Jul 2021 15:11:48 +0200 (CEST) Received: by mail-wm1-f48.google.com with SMTP id h18-20020a05600c3512b029020e4ceb9588so14442749wmq.5 for ; Mon, 12 Jul 2021 06:11:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5LiQ45Pezc/nQUy2+FwxHXYEU2zH6Eyxuf2n5bFhVxE=; b=dH1wRcdEzerr+Qhj3B9wN8aOPRNq6et2ntR4skcXixrPewtTxPGonQ0PeKIGa0/LwO rTOnRh6R5tBas5n04+F0IPH1r1amlN7uYG848J6/eBAiOsijl1LUYG14Ahwhv5eI9Cwe Azk8Z9ZI9GCIkFBhn9jQ4cZhf0DNjVppb0QMrySsWTtZ0K55qbI6yPQzyC0SxNTfNTIX LQK7wUmeVoi4ebQJXlrw2tgADOhIgIpLyLUNkXjyTcrZDdnhqj1ORcNjN/nCa4nl6h/F W9dJEinauJtVAIyBU7qWUbR7grgh1ir+6AhgOfzXulvk6T6uHfUklpmGkqGaLIrR5xI2 S89Q== 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=5LiQ45Pezc/nQUy2+FwxHXYEU2zH6Eyxuf2n5bFhVxE=; b=t133f3HDAxsYy+AzoZoTookdjQWs/lyt5rhygW7YRxGE63qlx8KaTBzgJFQiVTu4ok NQUXNnFq+9N1XlArTy6ZZfxvcmi0ApVo/5nO4LO670a2GpoTU00AiG/BXXFHjFgv5m2Y bl+FAMmGQhcVW5dEGFX5YoD8/KwFuNMf/ZnZTu5GRg6Ti61GnSU9xakIvFCBDvrVC1yd zIeSQNIdhBvFLlL34vjevlSZFgcrOoQnuyNf+XVkAbdVjdtK5+2quk9rDL+vcb4dXfIE MpxBxQauju6P7MELKuiWDnOFWTeDp9tH5MgYOsHk6VIUrggJkOZjC7XM43SAbPjaIwjU gT6A== X-Gm-Message-State: AOAM533ZdoIRqA4Rt5lavzIVsIVozKiHb8NMa6K0yA1mwcc5YgZPUPQm wf43XzFO6+/xc+6gGxrtSpE= X-Google-Smtp-Source: ABdhPJzvuLmpqtNMKox0CRL+ieewmIj0kt2qu2xHBKkV9wA+Hn+sk4DmYBREYnw/ZmH8bJ2B7lmK4A== X-Received: by 2002:a7b:c761:: with SMTP id x1mr11885696wmk.143.1626095508402; Mon, 12 Jul 2021 06:11:48 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id w22sm20110496wmc.4.2021.07.12.06.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:11:47 -0700 (PDT) From: luca.boccassi@gmail.com To: Owen Hilyard Cc: Bernard Iremonger , dpdk stable Date: Mon, 12 Jul 2021 14:04:28 +0100 Message-Id: <20210712130551.2462159-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.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 20.11.3 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 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7cd2146f272aa880f07eaf8acd8c4545f42492ab Thanks. Luca Boccassi --- >From 7cd2146f272aa880f07eaf8acd8c4545f42492ab 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 639b0051f5..d5bcb35e1d 100644 --- a/lib/librte_flow_classify/rte_flow_classify.c +++ b/lib/librte_flow_classify/rte_flow_classify.c @@ -579,12 +579,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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:38.436777600 +0100 +++ 0033-flow_classify-fix-leaking-rules-on-delete.patch 2021-07-12 13:41:36.294118528 +0100 @@ -1 +1 @@ -From 016441e3c770b65774d658c94a82c5bf5ed826fe Mon Sep 17 00:00:00 2001 +From 7cd2146f272aa880f07eaf8acd8c4545f42492ab 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,4 +19,4 @@ -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 +diff --git a/lib/librte_flow_classify/rte_flow_classify.c b/lib/librte_flow_classify/rte_flow_classify.c +index 639b0051f5..d5bcb35e1d 100644 +--- a/lib/librte_flow_classify/rte_flow_classify.c ++++ b/lib/librte_flow_classify/rte_flow_classify.c