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 7442645DB9 for ; Wed, 27 Nov 2024 18:20:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A5F54064C; Wed, 27 Nov 2024 18:20:09 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B615A402DE for ; Wed, 27 Nov 2024 18:20:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728006; 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=6VEUACsqbTSZbWDxIn6BHsJWRqnUVDmVDbs00KeE6r8=; b=TeKblCdyLkC670ZtMxSZZaGW3PO7BFCAltZ971Ib/0+Hq4AIEb8VsAQzDDG9Xnldgr3YWN /r4zit2Gug3drkXzSNBYS0jKfKonOkUJWtfxclS0tR9vYxE7JyXgQ8ucBFwdNmmUglfSGA UoxR69j+RVI0ys1RatPuv/giqF3L5rk= Received: from mx-prod-mc-03.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-621-7leUGC3BOhW7fh-bnnnA2A-1; Wed, 27 Nov 2024 12:20:02 -0500 X-MC-Unique: 7leUGC3BOhW7fh-bnnnA2A-1 X-Mimecast-MFC-AGG-ID: 7leUGC3BOhW7fh-bnnnA2A 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 49DB219560AA; Wed, 27 Nov 2024 17:20:01 +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 5F1693003B76; Wed, 27 Nov 2024 17:19:59 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Konstantin Ananyev , Wathsala Vithanage , dpdk stable Subject: patch 'raw/ifpga/base: fix use after free' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:17:21 +0000 Message-ID: <20241127171916.690404-14-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: 7Fp5BXEGg6B8c9N5o7FI4D9bDXdmX-SX_zZUIlvmnjA_1732728001 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/eb6697444c50ec59bd6f7479b3c7e1cb78380444 Thanks. Kevin --- >From eb6697444c50ec59bd6f7479b3c7e1cb78380444 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 8 Oct 2024 09:47:16 -0700 Subject: [PATCH] raw/ifpga/base: fix use after free MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 11986223b54d981300e9de2d365c494eb274645c ] The TAILQ_FOREACH() macro would refer to info after it had been freed. Fix by introducing TAILQ_FOREACH_SAFE here. Fixes: 4a19f89104f8 ("raw/ifpga/base: support multiple cards") Signed-off-by: Stephen Hemminger Acked-by: Morten Brørup Acked-by: Konstantin Ananyev Acked-by: Wathsala Vithanage --- drivers/raw/ifpga/base/opae_intel_max10.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/raw/ifpga/base/opae_intel_max10.c b/drivers/raw/ifpga/base/opae_intel_max10.c index 9d82fb0982..c3bc59842a 100644 --- a/drivers/raw/ifpga/base/opae_intel_max10.c +++ b/drivers/raw/ifpga/base/opae_intel_max10.c @@ -6,4 +6,11 @@ #include +#ifndef TAILQ_FOREACH_SAFE +#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = TAILQ_FIRST((head)); \ + (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ + (var) = (tvar)) +#endif + int max10_reg_read(struct intel_max10_device *dev, unsigned int reg, unsigned int *val) @@ -354,7 +361,7 @@ static int fdt_get_named_reg(const void *fdt, int node, const char *name, static void max10_sensor_uinit(struct intel_max10_device *dev) { - struct opae_sensor_info *info; + struct opae_sensor_info *info, *next; - TAILQ_FOREACH(info, &dev->opae_sensor_list, node) { + TAILQ_FOREACH_SAFE(info, &dev->opae_sensor_list, node, next) { TAILQ_REMOVE(&dev->opae_sensor_list, info, node); opae_free(info); -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:38.771438250 +0000 +++ 0014-raw-ifpga-base-fix-use-after-free.patch 2024-11-27 17:17:38.170269088 +0000 @@ -1 +1 @@ -From 11986223b54d981300e9de2d365c494eb274645c Mon Sep 17 00:00:00 2001 +From eb6697444c50ec59bd6f7479b3c7e1cb78380444 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 11986223b54d981300e9de2d365c494eb274645c ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index dd97a5f9fd..d5a9ceb6e3 100644 +index 9d82fb0982..c3bc59842a 100644 @@ -27,2 +28,2 @@ -@@ -7,4 +7,11 @@ - #include "opae_osdep.h" +@@ -6,4 +6,11 @@ + #include @@ -37,3 +38,3 @@ - int max10_sys_read(struct intel_max10_device *dev, - unsigned int offset, unsigned int *val) -@@ -747,7 +754,7 @@ static int fdt_get_named_reg(const void *fdt, int node, const char *name, + int max10_reg_read(struct intel_max10_device *dev, + unsigned int reg, unsigned int *val) +@@ -354,7 +361,7 @@ static int fdt_get_named_reg(const void *fdt, int node, const char *name,