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 4721645AE2; Tue, 8 Oct 2024 17:45:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 627FE410D4; Tue, 8 Oct 2024 17:43:37 +0200 (CEST) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mails.dpdk.org (Postfix) with ESMTP id 97C0440E42 for ; Tue, 8 Oct 2024 17:43:26 +0200 (CEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-71e1a715c72so278734b3a.1 for ; Tue, 08 Oct 2024 08:43:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1728402206; x=1729007006; 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=oUVqBA9TkOKHy45oGSv7pOvWAx2ksBqPQlUyI811wtk=; b=ELnoSEqvBN1hJXnFDwNPM3BsWfqTf21++C9t1trGOok7FmNez1midVFR/gPV+xv2mM GVXujV1fmJF/hJfOncGJksdHkGSBoKLqwyfpRdsooUX56ZpAfK3yv4S2yUINEPYkdf2G pyyGLhxOoSpWc0BddysjEOhHJsQe97+p3knSH+cpRxf79Nn7dc5fPF2EKY0Yq8FVkKYe FBZvj+Cq8j1rBFTNrfJ+S7bJGiJe4FkjR5Va/X8eMzcRwKNKIDySFwuCwSCSfmGwQ8ta +PiWdTRqpCtHf9VM3DJ65yaDByFEgsxBE1sloGh3rqx6pKmwNX36lh4qV37tdO0ljNat qa3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728402206; x=1729007006; 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=oUVqBA9TkOKHy45oGSv7pOvWAx2ksBqPQlUyI811wtk=; b=MdNcto6zMtAi8iz7vaiYWe8RRhvL+GBHZy+SretbRMzO7uhRnEvwWPg9Meb7GKE6th 2FtXArM++NDlJR+4MOQgFEuRnoS1dgxKSlqpDNm3CZW2lgKjRpueAORTz88POV5vcon+ mInuI9xtLJJmDzrTrV/eUoxTefX+QLatzzGYNsheUOQ6oIwKLQNUTYeGkGltRGwHaDlu MzeT9nHXy70qCuSXnsoZ+ZagdAiz1+kP7E6pWGSoy3hqS/I6Bsi6koFtj6iPma0XHGWQ VHSlOoqpR5le1zLLO8QgqxOAMmYJphXIqPBCGMSVvksQaSD9Gn9UxTgOOYPD2FBYlKIQ HxDA== X-Gm-Message-State: AOJu0YzUKSlUxiDeQj54iWMJRKSnRIufRBYmTyodn8ogaR4lpy1jmyYF Mb2QZWkSwJQkeaRfzlhwY21Yqgtfj9n2dvCsE/Oud94xQ62XIsXiijeDeu+tSbXgfoTp8xRE+IP q0Y/b5A== X-Google-Smtp-Source: AGHT+IG3pDzZHMG4j40vp3yLo10u2KspL7z7XOQsXezZxjuU5wblOoGNM2btDtEBOpXYtqIm5SPGvQ== X-Received: by 2002:a05:6a21:9d83:b0:1d8:a077:4e7f with SMTP id adf61e73a8af0-1d8a0775eecmr1684331637.14.1728402205869; Tue, 08 Oct 2024 08:43:25 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0ccf01dsm6293527b3a.70.2024.10.08.08.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 08:43:25 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , junfeng.guo@intel.com, Jingjing Wu , Xiao Wang , Beilei Xing Subject: [PATCH v8 16/17] common/idpf: fix use after free due Date: Tue, 8 Oct 2024 08:41:46 -0700 Message-ID: <20241008154301.66192-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241008154301.66192-1-stephen@networkplumber.org> References: <20240927204742.546164-1-stephen@networkplumber.org> <20241008154301.66192-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 e042ef871c..cf9e553906 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