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 96842468E4 for ; Thu, 12 Jun 2025 23:09:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90F7242E45; Thu, 12 Jun 2025 23:09:30 +0200 (CEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 3DC2442DD9 for ; Thu, 12 Jun 2025 23:09:29 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-43ea40a6e98so17296615e9.1 for ; Thu, 12 Jun 2025 14:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762569; x=1750367369; 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=cTQhbXJlcCddKpmUagbXXyHljN5XspmdjrVKxip0X/g=; b=kN5NPqWMxQ4cdeB0NpmNIt42iKMJ/iwqNIpPyyT4Plgpjxdm25u/C2dfLnEBWphGvK vQEeVyf4XgKQgdPuzOsYzAmxm/hd5QH9bLgaaigeUf0r0/qtNeVEsy+FTJ4YPX7TzFmV UCNVDE2EWj9Bm0we6eswxvyCleV1RhHOUYN0LDn9YUbhTVOSisA6zHaO7Zo1YrDQ5w1f xmQ/W+kM103Ow/9EKN012Sovn6BTUi3b0P5AB8bjf9nYq6/bHxKCTvg88jh7eOuXS3fG IknTlKHJTa+zsp6CYZWAIdlvWmLW9v4GauMhxGhI1Wg3gY7hVfhtD0Wp8lCzNv3kS5Lo WYVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762569; x=1750367369; 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=cTQhbXJlcCddKpmUagbXXyHljN5XspmdjrVKxip0X/g=; b=fegcyI86TiV9e6nKDfNWkuS2IDOqqpDRl0mqG5tvuhj03pRTB5/8esaZsEKl/pwU4g b07gGrZMc1DwGIE1hIFYVQYwF0dM0y63K/jRINBGj+qAqtQbO+9/6wPO9EgUA83X2szt Iq7AREZX4xql7fXvVlcJd89r4ZXbV02m4JHDQyN+LOpJ4C7hnP8Iifk7It1UIO4vt6Qu jH5BL2RNSugvP2TBz26BOZRelE9F7fpp/kZFmSzS0J2I5JibyDoy4j8jH/Qu7A1DGhk0 7qBEXNz/SCwoZ1A6/BtOI3YquJ1ZUoiNw0ClMRAyyCxhwK3gbwViWUXljcd3sy1lDSmU wEJQ== X-Gm-Message-State: AOJu0YyJJNO1Xge/4VWP7ONgBJz4SEJj08Q3Ubm9t4Ufj9Nu6ttMJN7K gG1iE5XiP1Og9QEeoOdm3fiuEaNSTug9cXLLcaKT6svrqHtBnsQYKUeWn3wCo7rO X-Gm-Gg: ASbGnctDhE+CDljb609wOHwtdGFPqmNCL2qAqctroUWuUgvkZmrqwtQSkag9OeLRv5U 81Qg5qsgz9YBQS8UC4PGIkt70k87modeyIRKOYMbsclE8P10HTa+LE8ywq4Yy2zvFgmn8JYseO1 46e2BoG0GQ9p+TDyIEN5SdLywIrpzUCBGXEyI3Q2jeKcEPFyU7J+29rOUUPLCboyTEu87WBCwgl PvCAazqRzDbGP51nrP6OD7RY9HXgLK7vxcxiKsEIyM+o1ZiwGzxsdwieqsEdCSGHkeJL63Blo3M 1om1UiSXYOHOluNuvlV7S2GIb8iTeEdB3qiQ5jtn+VDx3o2N2EZTV+K6BlbbY6gxCrof X-Google-Smtp-Source: AGHT+IEcYxrX0k7zsEx7yji9BnthLJ1cfUzdWDfUD+FMkvR2liyzE4L5j2MqY9Vd9RVeUQJhWS1o0Q== X-Received: by 2002:a05:6000:2005:b0:3a5:2949:6c38 with SMTP id ffacd0b85a97d-3a568748128mr673673f8f.52.1749762568736; Thu, 12 Jun 2025 14:09:28 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568a7389bsm397438f8f.37.2025.06.12.14.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:09:28 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/qede: fix use after free' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:51 +0100 Message-ID: <20250612210733.2506558-34-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/fb9df72195989e710bfea02de8e150bbaec22696 Thanks. Luca Boccassi --- >From fb9df72195989e710bfea02de8e150bbaec22696 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 13 Mar 2025 10:22:03 -0700 Subject: [PATCH] net/qede: fix use after free [ upstream commit ab8caba639ee6378055b2d8518e2a97b2212c737 ] The loop cleaning up flowdir resources was using SLIST_FOREACH but the inner loop would call rte_free. Found by building with address sanitizer undefined check. Also remove needless initialization, and null check. Fixes: f5765f66f9bb ("net/qede: refactor flow director into generic aRFS") Signed-off-by: Stephen Hemminger --- drivers/net/qede/qede_filter.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/net/qede/qede_filter.c b/drivers/net/qede/qede_filter.c index c5945451e8..de7ca28afd 100644 --- a/drivers/net/qede/qede_filter.c +++ b/drivers/net/qede/qede_filter.c @@ -12,6 +12,13 @@ #include "qede_ethdev.h" +#ifndef SLIST_FOREACH_SAFE +#define SLIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = SLIST_FIRST((head)); \ + (var) && ((tvar) = SLIST_NEXT((var), field), 1); \ + (var) = (tvar)) +#endif + /* VXLAN tunnel classification mapping */ const struct _qede_udp_tunn_types { uint16_t rte_filter_type; @@ -154,16 +161,12 @@ int qede_check_fdir_support(struct rte_eth_dev *eth_dev) void qede_fdir_dealloc_resc(struct rte_eth_dev *eth_dev) { struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev); - struct qede_arfs_entry *tmp = NULL; + struct qede_arfs_entry *tmp, *tmp2; - SLIST_FOREACH(tmp, &qdev->arfs_info.arfs_list_head, list) { - if (tmp) { - if (tmp->mz) - rte_memzone_free(tmp->mz); - SLIST_REMOVE(&qdev->arfs_info.arfs_list_head, tmp, - qede_arfs_entry, list); - rte_free(tmp); - } + SLIST_FOREACH_SAFE(tmp, &qdev->arfs_info.arfs_list_head, list, tmp2) { + rte_memzone_free(tmp->mz); + SLIST_REMOVE(&qdev->arfs_info.arfs_list_head, tmp, qede_arfs_entry, list); + rte_free(tmp); } } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:25.150359440 +0100 +++ 0034-net-qede-fix-use-after-free.patch 2025-06-12 22:06:23.858044384 +0100 @@ -1 +1 @@ -From ab8caba639ee6378055b2d8518e2a97b2212c737 Mon Sep 17 00:00:00 2001 +From fb9df72195989e710bfea02de8e150bbaec22696 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ab8caba639ee6378055b2d8518e2a97b2212c737 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/qede/qede_filter.c | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) + drivers/net/qede/qede_filter.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) @@ -21 +22 @@ -index 14fb4338e9..cecb58c997 100644 +index c5945451e8..de7ca28afd 100644 @@ -38 +39 @@ -@@ -154,15 +161,12 @@ int qede_check_fdir_support(struct rte_eth_dev *eth_dev) +@@ -154,16 +161,12 @@ int qede_check_fdir_support(struct rte_eth_dev *eth_dev) @@ -47 +48,2 @@ -- rte_memzone_free(tmp->mz); +- if (tmp->mz) +- rte_memzone_free(tmp->mz);