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 B01BB41E9F for ; Wed, 15 Mar 2023 15:37:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA64540A7A; Wed, 15 Mar 2023 15:37:37 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 9297642B7E for ; Wed, 15 Mar 2023 15:37:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t35YB/YYefQSJEESJT1eaGlZHqHYK06dEXY+qi2EBL8=; b=ThQd+q34585V7k+Q1r9vacXeZDFahd3VMfMOsIohj9GArGOTSaVL+Gvuw7En306TZQErmy UA79Eo8oSf1BxE4lz9ec/4zxlLRBboQDLAqJxoczl2MJF+fCufIerdpSEWSge6FImFWG/1 XhFSmG+/Kf0r4pw/kyZvB8JMhRLS4ds= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-550-MoaBGTMsOFmBlO1iv4gKag-1; Wed, 15 Mar 2023 10:37:33 -0400 X-MC-Unique: MoaBGTMsOFmBlO1iv4gKag-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 43B59101A553; Wed, 15 Mar 2023 14:37:32 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5903740C6E67; Wed, 15 Mar 2023 14:37:31 +0000 (UTC) From: Kevin Traynor To: Ciara Power Cc: Akhil Goyal , dpdk stable Subject: patch 'app/crypto-perf: fix test file memory leak' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:38 +0000 Message-Id: <20230315143640.677317-45-ktraynor@redhat.com> In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com> References: <20230315143640.677317-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/20/23. 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/a9cddaff93272805d0b7e5eb7722fa3172b7a1fb Thanks. Kevin --- >From a9cddaff93272805d0b7e5eb7722fa3172b7a1fb Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Fri, 10 Mar 2023 13:20:17 +0000 Subject: [PATCH] app/crypto-perf: fix test file memory leak [ upstream commit 430c35730e09dea162b7830b4719285eb6f36364 ] A memory leak was detected using the AddressSanitizer tool, when running the crypto-perf application with a test vector file. The strdup function used returns a pointer to a null-terminated byte string, which must be freed after use. This patch frees the pointer in an error case, and also after a successful run. Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test application") Signed-off-by: Ciara Power Acked-by: Akhil Goyal --- app/test-crypto-perf/cperf_options_parsing.c | 1 + app/test-crypto-perf/cperf_test_vector_parsing.c | 1 + 2 files changed, 2 insertions(+) diff --git a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-perf/cperf_options_parsing.c index 0858640723..1d91bea0c9 100644 --- a/app/test-crypto-perf/cperf_options_parsing.c +++ b/app/test-crypto-perf/cperf_options_parsing.c @@ -505,4 +505,5 @@ parse_test_file(struct cperf_options *opts, return 0; RTE_LOG(ERR, USER1, "Test vector file doesn't exist\n"); + free(opts->test_file); return -1; diff --git a/app/test-crypto-perf/cperf_test_vector_parsing.c b/app/test-crypto-perf/cperf_test_vector_parsing.c index 1e9dfcfff0..1fe11df27b 100644 --- a/app/test-crypto-perf/cperf_test_vector_parsing.c +++ b/app/test-crypto-perf/cperf_test_vector_parsing.c @@ -29,4 +29,5 @@ free_test_vector(struct cperf_test_vector *vector, struct cperf_options *opts) rte_free(vector->auth_key.data); rte_free(vector->ciphertext.data); + free(opts->test_file); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 14:30:21.677682838 +0000 +++ 0045-app-crypto-perf-fix-test-file-memory-leak.patch 2023-03-15 14:30:20.620123822 +0000 @@ -1 +1 @@ -From 430c35730e09dea162b7830b4719285eb6f36364 Mon Sep 17 00:00:00 2001 +From a9cddaff93272805d0b7e5eb7722fa3172b7a1fb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 430c35730e09dea162b7830b4719285eb6f36364 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 8c9f632590..26136a52ae 100644 +index 0858640723..1d91bea0c9 100644 @@ -27 +28 @@ -@@ -520,4 +520,5 @@ parse_test_file(struct cperf_options *opts, +@@ -505,4 +505,5 @@ parse_test_file(struct cperf_options *opts, @@ -34 +35 @@ -index 98e46c3381..737d61d4af 100644 +index 1e9dfcfff0..1fe11df27b 100644 @@ -37 +38 @@ -@@ -31,4 +31,5 @@ free_test_vector(struct cperf_test_vector *vector, struct cperf_options *opts) +@@ -29,4 +29,5 @@ free_test_vector(struct cperf_test_vector *vector, struct cperf_options *opts)