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 5249848A9A for ; Tue, 4 Nov 2025 06:29:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 495164060A; Tue, 4 Nov 2025 06:29:22 +0100 (CET) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mails.dpdk.org (Postfix) with ESMTP id 080D1402F0 for ; Tue, 4 Nov 2025 06:29:20 +0100 (CET) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-76e2ea933b7so5196529b3a.1 for ; Mon, 03 Nov 2025 21:29:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1762234159; x=1762838959; darn=dpdk.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+0xGKvb4s3y76CRxUEFcf/y9Rl/0w7aHHiEz7NmqzZY=; b=GhGzbcFaiTBf2x0wujgvNumNY+sEHSAy//pFJx+Y5vxp/oLAf1DEqXy7/WnLt4oKW0 Q8GIKABSpweNkMswawjwllnhLjbR5qlgAfbFQscp4U1fpydVuaLqNxxkF+vFDb38+Y6T 46JL9FqgtM2JCEe0TawXeyZzILIAgl3fA5IheBPHvRNanuUuHlxrA4+yPJNKNzvDI5On YDUT2ImkcUr96SxzJa7IH1bp90yWSRDDmRF8zL/Uq3U4bJFgG8dObBgejACLfuJMs5p+ nlf4/39Cz6oxTW2E2+ppY6J/PVGmR042EZzwY4njy9nYF+cQqBMXwauOgN1+9Y3WkAE1 QdTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762234159; x=1762838959; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+0xGKvb4s3y76CRxUEFcf/y9Rl/0w7aHHiEz7NmqzZY=; b=DArryLAczT6jImNBM/39vVP4eGy4seTqaOrzHTT+9rx9EoQ/WdPu2Ppbv35DDpPlHG tRHmn4CDbULNUvlSokOYSzAN2c23qn63On7ogTfiXJU7+qi1CaZN7mb8pRjWjgkYFkBZ lDsAt7pJ2ipxXD5FoZ42B35vVhupufX+T99VUGGHk0We/mcp3Rk3JajhBwwYWQktf5Zi tEEvP06anNehPogJMOs2s7VBVKYeY0YzqVD0iDZj20VMjcrJS1ACPF7cJk1gyuSH0886 rUy4Fu7uImjNajEafADgS/grdDAXgN1Um0Et9SqSnLfn72QghZ3ZlSQ3Twy6yuEsrxtk g4AQ== X-Forwarded-Encrypted: i=1; AJvYcCW1iM71CWEQ4tfLjUCANEzzToZ0u8kL5bSmd6GQyT/1LdL+yURCOYYrkPbDJf+wWY+9lHe9EwQ=@dpdk.org X-Gm-Message-State: AOJu0YwRVgpsAMF4XOXbY7xOdmUkeloHvBKHNIBp5XWC9dY4a7V4PiJU /aAdasdbdvlpmpQ5e1FnKPEREGecrNZBhUO08baFUgxZ1BhguMW7PnPJ4/KREdvVzsI= X-Gm-Gg: ASbGnctp8a+xOx9KUamwc0MGkY5ARkIm+QeilR7KANkU5fQao3eeyNJ0HpEEtEToGkp 3ZCa94n8foZ1XpmF0fAREJbg+5Ddi+bZW83Jd8BHawyt35S/rTzeeQzrtiC6ooDKij6RSmHfYgM tax/I0siHiNDxQi99v6hTSjmpb+i3yx9IpZFJKIKZaifEGSKVsLkGVJKBEslrLcs1zAGG61FL7n 9vrf6QxXUFX0rfc3fRX47eWmuFEdPpim6+l2zSG5Cv5fOj2WpKzNJSWGlz5tTnQIC6HIv+SuRlC 7dGG1JddIZpX7SM5onWxIJYlIUnNCoEaBm+wC4sTKurx6v50bjKy1q+c1L+vepx0zAtPKw42GFB L/klgShHCwLacr7s/QHCkqvF1XWjn8i7IhO9MlsiPucIVEmY20mtSzdMZJ5EUXQ/vjk2YeLhlYe yrpkTxR7Cd68KUBXk0oGghrLv8SrkN3FDeI0y3yIU= X-Google-Smtp-Source: AGHT+IHp278n7EGbHNYun5fgGM8qKOc8jF++/1L1sIqA0MYQaW+rkumr5G+/z9ROKW8Q9iZhv5qNGg== X-Received: by 2002:a05:6a20:3d84:b0:343:8069:7568 with SMTP id adf61e73a8af0-34e2afa23d3mr2388682637.27.1762234159165; Mon, 03 Nov 2025 21:29:19 -0800 (PST) Received: from phoenix.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7acd3d0130asm1364095b3a.32.2025.11.03.21.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Nov 2025 21:29:18 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , jin.liu@corigine.com, stable@dpdk.org, Chaoyong He , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Peng Zhang Subject: [PATCH] net/nfp: fix use after free Date: Mon, 3 Nov 2025 21:29:15 -0800 Message-ID: <20251104052915.270245-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.51.0 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 The code to cleanup metering was using the objects after calling rte_free(). Fix by using LISTFOREACH_SAFE Fixes: 2caf84a71cfd ("net/nfp: add meter options") Cc: jin.liu@corigine.com Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- drivers/net/nfp/nfp_mtr.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_mtr.c b/drivers/net/nfp/nfp_mtr.c index d4f2c4f2f0..4833ebd881 100644 --- a/drivers/net/nfp/nfp_mtr.c +++ b/drivers/net/nfp/nfp_mtr.c @@ -12,6 +12,13 @@ #include "flower/nfp_flower_representor.h" #include "nfp_logs.h" +#ifndef LIST_FOREACH_SAFE +#define LIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = LIST_FIRST((head)); \ + (var) && ((tvar) = LIST_NEXT((var), field), 1); \ + (var) = (tvar)) +#endif + #define NFP_MAX_POLICY_CNT NFP_MAX_MTR_CNT #define NFP_MAX_PROFILE_CNT NFP_MAX_MTR_CNT @@ -1124,10 +1131,10 @@ nfp_mtr_priv_init(struct nfp_pf_dev *pf_dev) void nfp_mtr_priv_uninit(struct nfp_pf_dev *pf_dev) { - struct nfp_mtr *mtr; + struct nfp_mtr *mtr, *tmp_mtr; struct nfp_mtr_priv *priv; - struct nfp_mtr_policy *mtr_policy; - struct nfp_mtr_profile *mtr_profile; + struct nfp_mtr_policy *mtr_policy, *tmp_policy; + struct nfp_mtr_profile *mtr_profile, *tmp_profile; struct nfp_app_fw_flower *app_fw_flower; app_fw_flower = NFP_PRIV_TO_APP_FW_FLOWER(pf_dev->app_fw_priv); @@ -1135,17 +1142,17 @@ nfp_mtr_priv_uninit(struct nfp_pf_dev *pf_dev) rte_eal_alarm_cancel(nfp_mtr_stats_request, (void *)app_fw_flower); - LIST_FOREACH(mtr, &priv->mtrs, next) { + LIST_FOREACH_SAFE(mtr, &priv->mtrs, next, tmp_mtr) { LIST_REMOVE(mtr, next); rte_free(mtr); } - LIST_FOREACH(mtr_profile, &priv->profiles, next) { + LIST_FOREACH_SAFE(mtr_profile, &priv->profiles, next, tmp_profile) { LIST_REMOVE(mtr_profile, next); rte_free(mtr_profile); } - LIST_FOREACH(mtr_policy, &priv->policies, next) { + LIST_FOREACH_SAFE(mtr_policy, &priv->policies, next, tmp_policy) { LIST_REMOVE(mtr_policy, next); rte_free(mtr_policy); } -- 2.51.0