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 1D1D345DB9 for ; Wed, 27 Nov 2024 18:20:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 19C03402DE; Wed, 27 Nov 2024 18:20:01 +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 A2E5C402DE for ; Wed, 27 Nov 2024 18:19:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732727999; 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=rvj94ee0P+xg4t+uZ4XLbvBwYlef//215BauWpY99Xg=; b=AsDU6qvxFgXYjPDNzEGTsm2Qjix3+zkIy3/gE3dv2Ie4NiFOK4kHRpvi+KGb87q9pY7KO7 2+9UtSwfYM4I0Qb/JiF49U8w358Go/Ky1quR5btxVnBN/C40ltkW4EsvWH72qshcSBrzFK UNnoPCB39FUXEqVIvWDCopNTSOP2/6w= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-384-1SWWA1ZnOg2B_gVuNm2JKQ-1; Wed, 27 Nov 2024 12:19:53 -0500 X-MC-Unique: 1SWWA1ZnOg2B_gVuNm2JKQ-1 X-Mimecast-MFC-AGG-ID: 1SWWA1ZnOg2B_gVuNm2JKQ Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7908E1955F43; Wed, 27 Nov 2024 17:19:52 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CFFD5300019E; Wed, 27 Nov 2024 17:19:49 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Pavan Nikhilesh , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Konstantin Ananyev , Wathsala Vithanage , dpdk stable Subject: patch 'event/cnxk: fix free function mismatch in port config' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:17:18 +0000 Message-ID: <20241127171916.690404-11-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: LUJdaiH_8Rn_TDFz6BdClL38trAJl9tq79sM1Vjsq48_1732727992 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 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 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/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/33d08e63989ddd9ec8ca44fa71aaebdd6eb5aae7 Thanks. Kevin --- >From 33d08e63989ddd9ec8ca44fa71aaebdd6eb5aae7 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 8 Oct 2024 09:47:08 -0700 Subject: [PATCH] event/cnxk: fix free function mismatch in port config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit db92f4e2ce491bb96605621cdd6f6251ea3bde85 ] The code to cleanup in case of error would dereference null pointer then pass that result to rte_free. Fixes: 97a05c1fe634 ("event/cnxk: add port config") Signed-off-by: Stephen Hemminger Acked-by: Pavan Nikhilesh Acked-by: Morten Brørup Acked-by: Konstantin Ananyev Acked-by: Wathsala Vithanage --- drivers/event/cnxk/cnxk_eventdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c index 2d422aea07..4ad16d22a3 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -203,6 +203,6 @@ cnxk_setup_event_ports(const struct rte_eventdev *event_dev, hws_fini: for (i = i - 1; i >= 0; i--) { - event_dev->data->ports[i] = NULL; rte_free(cnxk_sso_hws_get_cookie(event_dev->data->ports[i])); + event_dev->data->ports[i] = NULL; } return -ENOMEM; -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:38.680009619 +0000 +++ 0011-event-cnxk-fix-free-function-mismatch-in-port-config.patch 2024-11-27 17:17:38.161269041 +0000 @@ -1 +1 @@ -From db92f4e2ce491bb96605621cdd6f6251ea3bde85 Mon Sep 17 00:00:00 2001 +From 33d08e63989ddd9ec8ca44fa71aaebdd6eb5aae7 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit db92f4e2ce491bb96605621cdd6f6251ea3bde85 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index c1df481827..84a55511a3 100644 +index 2d422aea07..4ad16d22a3 100644 @@ -28 +29 @@ -@@ -122,6 +122,6 @@ cnxk_setup_event_ports(const struct rte_eventdev *event_dev, +@@ -203,6 +203,6 @@ cnxk_setup_event_ports(const struct rte_eventdev *event_dev,