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 5908E45A9F; Wed, 2 Oct 2024 20:41:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 685C440BA2; Wed, 2 Oct 2024 20:39:54 +0200 (CEST) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mails.dpdk.org (Postfix) with ESMTP id CCCFA406B7 for ; Wed, 2 Oct 2024 20:39:42 +0200 (CEST) Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-656d8b346d2so33596a12.2 for ; Wed, 02 Oct 2024 11:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1727894382; x=1728499182; 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=AC6+8ukQue2BMq8mJkbAIhtSXLvqWNSJsJoOn0Ks0FQ=; b=q7vEnr3vkisrp1vwhE9v6Vvve/PLEwB8PVe9JkKm7YmFeuCJ2KIAStsKJIcML3jHVy i4Bc2eSWFixg5cl8W1seLiugiz29NrDl/VgP8Pw/UzFUhNw3YqywCXJZPeFYQ0BtaGff /TPM7GNyhJUoVhx+iPTmMJFX9v11YY9ED+neuK84scN7dU0utZZ+SI+gr51xUSPI4MAp DmUJ6GBY9iq68ITbsJYM29xCcN/Znu3/Vq4lt9RrAEHAumXvnpekGm1quGObUpke9gac plLNUQ44mvYl0b9nWmjwNeiAVrKbXa4nB9QGYSgJTU5wj7+d/KS6Ihh5KVVMmpkk22Kh OAcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727894382; x=1728499182; 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=AC6+8ukQue2BMq8mJkbAIhtSXLvqWNSJsJoOn0Ks0FQ=; b=P6kf8qFSKDq7sPMCrAYhYzTWmrrO14RdrjszQ1bXGMUl8yZpebh/+O3tTm7o68ht9L x+6nA2vtMHpXM/lpaabxmf1NWOkXn+a6am/A98co4LRMiqXu9ekpnd7jwLPCtUD3CAXB jRQh6BBUW6laLUFx7iSaaVFIfAudKOIxeefgeD13Z5yqHtprc9KGeTs+cAVyy0D2XmbO BGH3o22rK46P3iRwhCVkxuPLIFx/wdnG4RAJsDBFNIzc/Spuv7RuMTsW93cW5WW8UVJU HmmzLqVmmYxb77yL2iaDOf27/IRohNDwFpocyV26fVYs/IGJQtZGLeQSlkTL0l214rr9 pAgg== X-Gm-Message-State: AOJu0YzhfE4HVVsG21YcX7hM+T+uh88jd3fVZ2ht5WgJRYw/vAVEUMFq KR2xWocKaezQai3ALZAOSn0jy0kT9ps+CDjBjilr0QHz1eKxVoZ3m15zJzMft0zRfLnYBi52qDq k X-Google-Smtp-Source: AGHT+IHCFapdD2+oQ4heuyngWOp3dbkSmpUzqpU7taFMxG42aiCUbXkuyyxCNzzYA35pFt24PtNHAQ== X-Received: by 2002:a05:6a20:c6ca:b0:1d5:10c3:ae43 with SMTP id adf61e73a8af0-1d5db2315efmr5759530637.21.1727894382083; Wed, 02 Oct 2024 11:39:42 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71b2649b0bdsm10104362b3a.34.2024.10.02.11.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2024 11:39:41 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , junfeng.guo@intel.com, Jingjing Wu , Beilei Xing , Xiao Wang Subject: [PATCH v7 16/16] common/idpf: fix use after free due Date: Wed, 2 Oct 2024 11:37:54 -0700 Message-ID: <20241002183918.161656-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241002183918.161656-1-stephen@networkplumber.org> References: <20240927204742.546164-1-stephen@networkplumber.org> <20241002183918.161656-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The macro in this driver was redefining LIST_FOR_EACH_ENTRY_SAFE as a simple LIST_FOR_EACH macro. But they are not the same the _SAFE variant guarantees that there will not be use after free. Fixes: fb4ac04e9bfa ("common/idpf: introduce common library") Cc: junfeng.guo@intel.com Signed-off-by: Stephen Hemminger --- drivers/common/idpf/base/idpf_osdep.h | 10 ++++++++-- drivers/common/idpf/idpf_common_device.c | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/common/idpf/base/idpf_osdep.h b/drivers/common/idpf/base/idpf_osdep.h index b2af8f443d..7dff9bc79c 100644 --- a/drivers/common/idpf/base/idpf_osdep.h +++ b/drivers/common/idpf/base/idpf_osdep.h @@ -341,10 +341,16 @@ idpf_hweight32(u32 num) #define LIST_ENTRY_TYPE(type) LIST_ENTRY(type) #endif +#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 + #ifndef LIST_FOR_EACH_ENTRY_SAFE #define LIST_FOR_EACH_ENTRY_SAFE(pos, temp, head, entry_type, list) \ - LIST_FOREACH(pos, head, list) - + LIST_FOREACH_SAFE(pos, head, list, temp) #endif #ifndef LIST_FOR_EACH_ENTRY diff --git a/drivers/common/idpf/idpf_common_device.c b/drivers/common/idpf/idpf_common_device.c index 8403ed83f9..e9fa024850 100644 --- a/drivers/common/idpf/idpf_common_device.c +++ b/drivers/common/idpf/idpf_common_device.c @@ -136,8 +136,7 @@ idpf_init_mbx(struct idpf_hw *hw) if (ret != 0) return ret; - LIST_FOR_EACH_ENTRY_SAFE(ctlq, NULL, &hw->cq_list_head, - struct idpf_ctlq_info, cq_list) { + LIST_FOR_EACH_ENTRY(ctlq, &hw->cq_list_head, struct idpf_ctlq_info, cq_list) { if (ctlq->q_id == IDPF_CTLQ_ID && ctlq->cq_type == IDPF_CTLQ_TYPE_MAILBOX_TX) hw->asq = ctlq; -- 2.45.2