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 B3E4D468E4 for ; Thu, 12 Jun 2025 23:09:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE4DE42DD9; Thu, 12 Jun 2025 23:09:32 +0200 (CEST) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 1CAF742E02 for ; Thu, 12 Jun 2025 23:09:31 +0200 (CEST) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-450cf214200so12474625e9.1 for ; Thu, 12 Jun 2025 14:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762571; x=1750367371; 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=HCWH2dcMMvQQb1N+0lBOgmp4qawCuKMgme14s2cbzHM=; b=RUXbSqqiQ+I46CimCgajXUnKD90hVgIgPgQzgjeBxpeqTdUL8E/BmVrmeIHhKCfTNw NeicTD6xrs5zyq4OJcOW4Q+UN+m+QDIklHTmjoXA0nOAIUn/RBkolLn59seqTHc9YLqZ hYJjQ1H4qS1pbRP64sqqUhiug0phG3h9REzChErfrgMj1Ma8gQgg1TjiwemB9MO6vuHc bja8iX1zPIO5IiY+iBJBI4FekBr97h9fhACCTiskZoFA//WuDEK3peRaaPWGBPWN8euj sENDgPMXi5Vm1v3Aw0VKQnJDd/rj9xhF1B8M9bhRf60o84kAo8tHZ1LBQClcmEh1GO75 doug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762571; x=1750367371; 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=HCWH2dcMMvQQb1N+0lBOgmp4qawCuKMgme14s2cbzHM=; b=sOuKFfGzeqxcdobQmRvQn37s2KZivxlm+lG7PMSGEckzmmsXswbiWE1PeTSuXzuggQ Y9BKd5NboUwW2s8tijsjwLfmJcyJOeeBZuRswc2sjWAM4gWYzacx912OfaAYKlkhHxbm qf+kRWA3yN3mPkGllqbtD0FCEjMabcc07Kx2n8q2Dc1m8nkjpzZe2P09rILqJUGFuIlV VfvVtL4D2l3y+JtGno8rI8OF2BHS6/GU8kTHrIng6gQGsPvkwwQvQuFFOo6FDFI8I5gn 85Hn0Cm8RxBw1bK9t9/U6LjkoFuzMpc/nCzWJccDm6fHSVUbqN8Kv9VJnC09iue6pEC8 /M2A== X-Forwarded-Encrypted: i=1; AJvYcCWSz6FTiRtbf67BzyhXGbI46vtJSKd9H36LADtFmKJNbVoP5D2n8L39HyOaXfmcCgDtJhxprN4=@dpdk.org X-Gm-Message-State: AOJu0YyaJcIO6NbLNovklwhI8P96S9C7238RDgiL61G0+jKdepGtP8G3 OwvgjH5vC8aVPsgbQWMyXKLTg7RDVXCE5Inn7tRHoCRxsV7iKnrXS9MDxeQpdeWi X-Gm-Gg: ASbGncu4qsMB2aDCAMiy5O7OCsT6Nkg5nQ1hUFbiT+mQYX7AUEdFmVci6h5cG/9s/ti 30TyF7KhyGZvmcbWCRhiEiUz6r8K9eWNSIvXriLbXHd8Ke/N24S6b1SQLtphpE5yDSCRXxWnZ39 3Bq9ok/4LxAYDYIg9qLnYd/bUyZ95fcaEWNTq3eZOqwnSekAgFF8p3ik6RX34eB2Sd5gf1q6Qz1 k1nPEqkQFk1ya4Gdfy9qA5SsHCgtLR5wGIxCFGMIswek8KVnmtTn58x2Zc2ovZ5s/GpEeQR/yNA bf9MvjGD5SdiTgMhzRVrHf028JTmxEZ4K8tDgRcFGqDXKMlFZThIlUEKXKma5IMtGGmi X-Google-Smtp-Source: AGHT+IFXLiN8opg/EBh9qJEyTm40Cy9hTvrkyypn2OmsBGKC1NaHNhMauMBns9GtTLjg5a+wf3yG5g== X-Received: by 2002:a05:600c:37c7:b0:43d:b85:1831 with SMTP id 5b1f17b1804b1-453349b78b7mr6993675e9.0.1749762570551; Thu, 12 Jun 2025 14:09:30 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532e14fc8bsm31971595e9.28.2025.06.12.14.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:09:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Hemant Agrawal , dpdk stable Subject: patch 'bus/fslmc: fix use after free' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:52 +0100 Message-ID: <20250612210733.2506558-35-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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.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 06/14/25. 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/e2de1b07099f7dc987cd1df4e939e44af3aa6d72 Thanks. Luca Boccassi --- >From e2de1b07099f7dc987cd1df4e939e44af3aa6d72 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 16 Apr 2025 07:58:14 -0700 Subject: [PATCH] bus/fslmc: fix use after free [ upstream commit 1cad17c43079268d9e15db62b3a1edd42df8d81e ] The cleanup loop would dereference the dpio_dev after freeing. Use TAILQ_FOREACH_SAFE to fix that. Found by building with sanitizer undefined flag. Fixes: e55d0494ab98 ("bus/fslmc: support secondary process") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index 4aec7b2cd8..6bf3b15be9 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -38,6 +38,13 @@ #include "dpaa2_hw_dpio.h" #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 + #define NUM_HOST_CPUS RTE_MAX_LCORE struct dpaa2_io_portal_t dpaa2_io_portal[RTE_MAX_LCORE]; @@ -364,6 +371,7 @@ dpaa2_create_dpio_device(int vdev_fd, int object_id) { struct dpaa2_dpio_dev *dpio_dev = NULL; + struct dpaa2_dpio_dev *dpio_tmp; struct vfio_region_info reg_info = { .argsz = sizeof(reg_info)}; struct qbman_swp_desc p_des; struct dpio_attr attr; @@ -549,7 +557,7 @@ err: rte_free(dpio_dev); /* For each element in the list, cleanup */ - TAILQ_FOREACH(dpio_dev, &dpio_dev_list, next) { + TAILQ_FOREACH_SAFE(dpio_dev, &dpio_dev_list, next, dpio_tmp) { if (dpio_dev->dpio) { dpio_disable(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token); -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.183404591 +0100 +++ 0035-bus-fslmc-fix-use-after-free.patch 2025-06-12 22:06:23.858044384 +0100 @@ -1 +1 @@ -From 1cad17c43079268d9e15db62b3a1edd42df8d81e Mon Sep 17 00:00:00 2001 +From e2de1b07099f7dc987cd1df4e939e44af3aa6d72 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1cad17c43079268d9e15db62b3a1edd42df8d81e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index bad25a0ec2..e32471d8b5 100644 +index 4aec7b2cd8..6bf3b15be9 100644 @@ -23 +24 @@ -@@ -39,6 +39,13 @@ +@@ -38,6 +38,13 @@ @@ -36,3 +37,3 @@ - RTE_EXPORT_INTERNAL_SYMBOL(dpaa2_io_portal) -@@ -412,6 +419,7 @@ dpaa2_create_dpio_device(int vdev_fd, - struct rte_dpaa2_device *obj) + struct dpaa2_io_portal_t dpaa2_io_portal[RTE_MAX_LCORE]; +@@ -364,6 +371,7 @@ dpaa2_create_dpio_device(int vdev_fd, + int object_id) @@ -45 +46 @@ -@@ -597,7 +605,7 @@ err: +@@ -549,7 +557,7 @@ err: