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 65CA045A9D; Wed, 2 Oct 2024 17:46:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DE0B40689; Wed, 2 Oct 2024 17:45:03 +0200 (CEST) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mails.dpdk.org (Postfix) with ESMTP id 009484066F for ; Wed, 2 Oct 2024 17:44:53 +0200 (CEST) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-719b17b2da1so7228b3a.0 for ; Wed, 02 Oct 2024 08:44:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1727883893; x=1728488693; 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=m6wFbuX+GWxrQIrwLcsX76B/MUVjPbTaVKqJ2iWJ9IIBMmtTn7qRjfUcjWB23fwl7Z zwpj3JHbsWAT6bH1ppDu84UaPWytTcq5jXwuRz4/6igd8TE2IVWSJaz+miIrQq5TtTjQ tyycsivVWCHZULPhhfodapXaTEUf+cnxae5MWXKC4hqauX1lQToIWHdeDy6FVSM9qZ++ kf/LSrf0mSCiwltGbEYKUFi+rtGC8cqEWOHPHQIeSwP4lIeZegSJi6871WGjz7oie4Kp LMhqnDTdYYzLYmqfIVAzmyvf1xsn5cmCzzf2Bb5GNJISJUB6zt0+GrIQ/CoRAgEMiQ4D O2Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727883893; x=1728488693; 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=WnGLhWRLziLvI7KUOhujOTbwpqsYdlLNl+MmGCHJWdwiagyiWo3ZNDlbojJitPveip PWmbuolHDCAn33rD8wDopqamksfFR9tc20Ew5YiEEwx1V9Y2K6sbULT9m0pPvLu9Gmzm fQ0jmXh7CzvijQBlZ2MD3YzI+2As5c1V+kXJphefSRmr+QsBPeY9ks/Cec1q6rjOPZPv O8SWkZSmDgQ0H64WC0PjOml5IVNICseMmLlgqg7+IJn/51alZ5YaKnC1OZOvVblKqyDN ByDKIEad1+Io92Tcd95ls+UfzzUg18gj9I/KehPtzw4gxFPLg8YSo2iXM9+aEGHzh1SW 7Raw== X-Gm-Message-State: AOJu0YzZDdQiCleXyhUMjWd0+WqBM2BAexCw6ww0DFbTzeIGCl+zpfMa Ub3TpkAyNIU1k9eApLFV1ae+/hOZDXgf8KnslGADuojhrur1a+zGcFFqyPsd67exhy9HZWuC8YI 0bQk= X-Google-Smtp-Source: AGHT+IGx/IrY5JLfqSitKjiliK3DoYp24pr2hVRqEIPQKv9ljPP3Pt/kXuDl0CFp3ZqLXUIUAP4UtQ== X-Received: by 2002:a05:6a00:8d1:b0:718:f026:6c78 with SMTP id d2e1a72fcca58-71dc5ca80efmr4871090b3a.13.1727883893216; Wed, 02 Oct 2024 08:44:53 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7e6db2927c7sm10247363a12.1.2024.10.02.08.44.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Oct 2024 08:44:52 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , junfeng.guo@intel.com, Jingjing Wu , Beilei Xing , Xiao Wang Subject: [PATCH v6 16/17] common/idpf: fix use after free due Date: Wed, 2 Oct 2024 08:43:00 -0700 Message-ID: <20241002154429.64357-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241002154429.64357-1-stephen@networkplumber.org> References: <20240927204742.546164-1-stephen@networkplumber.org> <20241002154429.64357-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