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 C438E45BB6 for ; Wed, 23 Oct 2024 23:17:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BEFCC40261; Wed, 23 Oct 2024 23:17:48 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id A2B5C43267 for ; Wed, 23 Oct 2024 23:17:47 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-37d49a7207cso117598f8f.0 for ; Wed, 23 Oct 2024 14:17:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718267; x=1730323067; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f7AI52ezNdBJDfQ151WpAtTdKaXVskAwO20JkC1RFcU=; b=KJBZtrPAMJ+VdLmdK12vjg1akb9rq2R4DgXDAg+nf1q05zwHejNBTY8vZDCx0haoaQ jwcMLiOhCay/DEjM0dem74S5+GdKSgsmOM0z1r4eYTaY3cN5oJy5UHZJAqBmI4187INe DaUpM1UJwWXcKsMlgkbVx5aFNgyPk7miD2u9umEKvP3F+qiohRrnh9jz12CAVuKuoKch sGQMBJOc2II+wAizngA/dkiFaIOUY9ExQlQkR+f7lnyyf0v5YFrtfHjpdvqF3ugBdhjk JycnbM4TrA+0DWW9qsCJFAo6LjWL6rCFCKJkY+yA6XVWuN1BQfpUyi3N3+uy8J/TMUdP O0MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718267; x=1730323067; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f7AI52ezNdBJDfQ151WpAtTdKaXVskAwO20JkC1RFcU=; b=YMpYV85HqIWAZIVaD3Yt37V8SSXtLYk0v5keC37AXHhhcB6HxZHCZlXeJA9GfrXnBa IDIOTdZ8bHDFBtCxpdGVR/A/ThQ+0OuI6V+eLzLuOtAV59w2tCAGT8rrsol8yizJQwEf jSP4eBYc877HLIgbV1O/rRDFGvYglfUgu+WaYKUFnjG+pa1XPH1PLwOh95NffVSBNtPc wj8YCuW7AMhBePuQU7+QPgRLkFvAZEbcYKf8EPKykf974aJKb5fxb7VwDCon6g/Jz2mn 5VmCUvp+z3wCgiGxjNI/7z68bOs8TQkt7LExzKIt25UQrynkEkkTafnTbwqyTaf5OQwS RcaQ== X-Forwarded-Encrypted: i=1; AJvYcCVREvtZLCnEsvA34iS8zNrHFLLeW6EH0iT4rLQnZXqU0UBMKgLjIXG7DZfktD0MNJeACC4523Y=@dpdk.org X-Gm-Message-State: AOJu0Yy7W5iDh0p3cORsf39oiMkMxjnj9YlpiZy+XwaiLiuyJTMHrrE9 AsPYqKGcSyUleFoOGaruaLp8FHDiE1o2gjdr9sSknarYB0sAaBDk X-Google-Smtp-Source: AGHT+IH2fG8jQ+MmNUJICi2w3WW87bLR1SkjajLtTx6Y9cWz3NWF60lHJdKxQbr1L83YKOT86E/q2Q== X-Received: by 2002:a5d:6a47:0:b0:37c:d299:b5f0 with SMTP id ffacd0b85a97d-37efcf960a2mr2426629f8f.59.1729718267152; Wed, 23 Oct 2024 14:17:47 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a4d532sm9758620f8f.46.2024.10.23.14.17.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:17:46 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.7 Date: Wed, 23 Oct 2024 22:15:52 +0100 Message-ID: <20241023211704.1216956-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 22.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 10/25/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/4cf7c66de71156b980f5adb4582fa21bb5616ec8 Thanks. Luca Boccassi --- >From 4cf7c66de71156b980f5adb4582fa21bb5616ec8 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 205cc76572..eff3c42f74 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -109,8 +109,8 @@ cnxk_setup_event_ports(const struct rte_eventdev *event_dev, return 0; 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.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:41.003601502 +0100 +++ 0012-event-cnxk-fix-free-function-mismatch-in-port-config.patch 2024-10-23 22:16:40.443940563 +0100 @@ -1 +1 @@ -From db92f4e2ce491bb96605621cdd6f6251ea3bde85 Mon Sep 17 00:00:00 2001 +From 4cf7c66de71156b980f5adb4582fa21bb5616ec8 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 205cc76572..eff3c42f74 100644 @@ -28 +29 @@ -@@ -121,8 +121,8 @@ cnxk_setup_event_ports(const struct rte_eventdev *event_dev, +@@ -109,8 +109,8 @@ cnxk_setup_event_ports(const struct rte_eventdev *event_dev,