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 3945143829 for ; Tue, 5 Mar 2024 16:35:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B93942DF2; Tue, 5 Mar 2024 16:35:30 +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 C6BA042DDF for ; Tue, 5 Mar 2024 16:35:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652927; 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=EuPesQicfSOPUDwqrvs0GSybqjr1dMBMHnIzWoUcLBA=; b=gSHV8XOCSK1riBohTR1R8vmsTwEi9+DcqDDlsENevYqqghd7pPNnyTFkUuAnffF8y9CewW MAP1XeuB9buJfd2IA677WJ1c6wKuWMiz60rJWj9FOYq2FEdkm1XzAP54AbaOm4WWWerTHn xHy8O2Hl9+xD5wRiG61r5VHhMZh2pmA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-464-cJWbD9zFOb6RvdeAumJe5w-1; Tue, 05 Mar 2024 10:35:25 -0500 X-MC-Unique: cJWbD9zFOb6RvdeAumJe5w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7DE86101A56C; Tue, 5 Mar 2024 15:35:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5F3E200B25C; Tue, 5 Mar 2024 15:35:24 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: dpdk stable Subject: patch 'examples/qos_sched: fix memory leak in args parsing' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:33:55 +0000 Message-ID: <20240305153449.263666-22-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.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 03/11/24. 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/f6975c91bc2922390c2aaf62263f910918b189e7 Thanks. Kevin --- >From f6975c91bc2922390c2aaf62263f910918b189e7 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 10 Nov 2023 10:01:16 +0000 Subject: [PATCH] examples/qos_sched: fix memory leak in args parsing [ upstream commit db8aee153e43375538667c6f861e981a47574476 ] Should free the memory which allocated by strdup(). Fixes: 035b6a4f4bba ("examples/qos_sched: fix out-of-bounds option parsing") Signed-off-by: Chengwen Feng --- examples/qos_sched/args.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c index ff51d0215a..7c92f14a02 100644 --- a/examples/qos_sched/args.c +++ b/examples/qos_sched/args.c @@ -143,6 +143,8 @@ app_parse_opt_vals(const char *conf_str, char separator, uint32_t n_vals, uint32 n_tokens = rte_strsplit(string, strnlen(string, 32), tokens, n_vals, separator); - if (n_tokens > MAX_OPT_VALUES) + if (n_tokens > MAX_OPT_VALUES) { + free(string); return -1; + } for (i = 0; i < n_tokens; i++) -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.228732399 +0000 +++ 0022-examples-qos_sched-fix-memory-leak-in-args-parsing.patch 2024-03-05 14:08:54.629520709 +0000 @@ -1 +1 @@ -From db8aee153e43375538667c6f861e981a47574476 Mon Sep 17 00:00:00 2001 +From f6975c91bc2922390c2aaf62263f910918b189e7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit db8aee153e43375538667c6f861e981a47574476 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index e97273152a..8d61d3e454 100644 +index ff51d0215a..7c92f14a02 100644 @@ -20 +21 @@ -@@ -104,6 +104,8 @@ app_parse_opt_vals(const char *conf_str, char separator, uint32_t n_vals, uint32 +@@ -143,6 +143,8 @@ app_parse_opt_vals(const char *conf_str, char separator, uint32_t n_vals, uint32