From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF1323BFE24 for ; Thu, 4 Jun 2026 05:18:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780550313; cv=none; b=HiPJMzjRyo5iu4QZqPtZybPiXQ1xmz5ZT3UOBqlSzsQaa/nJtUg24YV6CSdmFQ537Kv6uXYyjw45FDvvCokyjVtu6JUCyJAl+DOD3eZZvtnO9gokqk7NYNhpQ/4o+XLiH7wHN9HmvcVcYvj8mQnyXN4b+tZeHpNhj8a/q4/+I7U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780550313; c=relaxed/simple; bh=s3eSFIhSroDbWAI1zZwjjlbEoJePmn4Sz3PrpBM79bw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=h+YK6Hhd7N7m890+nc811uhtM6r5Z3LmfBELZnvtwFEKwJfPDTRecS0JGEvzOpBmngWI0ZMhGYCO+J9eC02GIMmXfBkCAZDZt63lplCC7N6L2FF0Q1w4QNVqG3L+gcN+/VlLvWTvF9UQDM9o2JjmX+rK3RB8zFIcYEx34hFEYT8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k6S9905L; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="k6S9905L" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2c0aa420401so2236865ad.3 for ; Wed, 03 Jun 2026 22:18:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780550307; x=1781155107; darn=vger.kernel.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=umuccskTvPELH8yp9qi1ExFn7OMlDISJoOngAwbhXJA=; b=k6S9905L093APO0rSYlYX/6hwP1IBrPY3lILWyjp0wmm1TPHqg8AeOAX7qvvMhmhWE MTPYHndloDIkXPodLlOq9EAXilawJZVppvxjpjQnJrYuG5ETENThO5p+xugE7BBTZbEu TYggYsPuHJunU7NgaHN0TxoRLuykwz9+6tGXSvHBSuIwBR0TaZ3gXvBjIlExvIxZ4fVw RPjGuv1PcGgQJupPAfjcnDnslxzQbkRXzWt47X/RjdPkX8T3W8OMgeB/OcFK18hBeGZC YSE6PlRaMYcmlcFxa+o4s3pdrKIISGy0nneIcu+Vn0NiR7EdQEfjH/gUF2VyKMm7P+uP M8fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780550307; x=1781155107; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=umuccskTvPELH8yp9qi1ExFn7OMlDISJoOngAwbhXJA=; b=TmXmRixuY0DupuqzvY/kl0OKcF0VkqQrRh2n4HYzJjL7SO4BRMOM8NqgTe9nZDuEwB RNcMDqtICqtL0gSZP/gNZsYpKzcyPGZqq31RjhtoQShIqGYOuEr8O66F9AZJDmtajYKF ITU+I3BLDdxKbmBM+H+TSuOO53BQQzqdLGn72vXFiGQuVO/9Sr2lBMOUO6AnCECLfb3/ JpRtxvxwJ90IkmzugWhNr9M8QHW4xAfhuJc8xqPeEb+CVcZBNbN9gkDEEidw9GZZu3NO m7YenscuIhh4FO4fQoCK1ITNDuqHybwtnobFN8gNAa8Kr4t+krGaZo55kK7d8hpRlKNf 3mjw== X-Forwarded-Encrypted: i=1; AFNElJ+6deSbU9bkHdeJvJNbZViu3FWCbnbKQXOhuQE96EnDsXWSphfJFpwDCI63zMVWdVv72u5KA9KIs+Mx7dM=@vger.kernel.org X-Gm-Message-State: AOJu0YyyG2EFwJbXEd/MFdQzpLCo0shqWf59uYOtsEnb9UlfYlVQy8t9 KtbR/iax9aR5NqXWUsFNoyKxoPvXG4hI49athvsYBhwzS6ku/hWAk/cC X-Gm-Gg: Acq92OHKMbE8anNYwtN1SnhiT3C8rKZ432gRxMCsZRJrzTgkCouu1YqrTGRBRY4gZBw DnzWyzDWJYXsAtLnA8OxkEFySEl9D1DpaGex91mSR5bEMhnQzQ1YKf00MPOXI+6lCCGS32WlxZk 0/YrB1sf2NZ1YmxND37wdN9npjxUqGy/V7KDr/jsWqw4WMVFeE5cjMcXDc+TiiYZ5fPz5ceFg4w v9+3iUdaQ4TgXr5Q8Gq9tVEFmMpy5xdxdrVFbObMLFZbDUuwls0hOieaCBOWqgATOPjjB/HGcXS 2k9lSTOZvLR81zFUajhJgFZTkQcOZxVo/dKWaQfyZcZqWmwXTnorHaWD4IF5COWZQpit1T++IY6 FqvtY2bW6fN3dSIhJg2mKqKU+IodJUCixm3HMdVV7W1qHidM6xYU3VRv6KMqv+VZnh4/yWzXWKf HEllqc+GnEqYZPllR2y8xwy/iuWPOlsSl5MezjAkeVNp+/ljibYPstqRgK1hY= X-Received: by 2002:a17:90b:2811:b0:36d:5dbe:2a0d with SMTP id 98e67ed59e1d1-36e30c23af4mr6513768a91.7.1780550307210; Wed, 03 Jun 2026 22:18:27 -0700 (PDT) Received: from csl-conti-dell7858.ntu.edu.sg ([155.69.195.57]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-36f6bf827e6sm2009262a91.1.2026.06.03.22.18.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 22:18:26 -0700 (PDT) From: Maoyi Xie To: joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, jpb@kernel.org Cc: iommu@lists.linux.dev, linux-kernel@vger.kernel.org, virtualization@lists.linux.dev, Maoyi Xie Subject: [PATCH 2/2] iommu/virtio: Avoid using the list iterator past the loop in viommu_add_resv_mem() Date: Thu, 4 Jun 2026 13:18:16 +0800 Message-Id: <20260604051816.2976221-3-maoyixie.tju@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260604051816.2976221-1-maoyixie.tju@gmail.com> References: <20260604051816.2976221-1-maoyixie.tju@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit viommu_add_resv_mem() walks vdev->resv_regions to find the insertion point. When every element has a smaller start address, the list_for_each_entry() iterator ends up one past the last entry, and &next->list then aliases the list head, so the following list_add_tail() still appends at the tail. The result is correct, but using the iterator after the loop is undefined per the list_for_each_entry() contract. The loop only needs a list_head as the insertion point, so iterate with list_for_each() and keep the typed list_entry() dereference inside the loop body. No functional change. Suggested-by: Robin Murphy Signed-off-by: Maoyi Xie --- drivers/iommu/virtio-iommu.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c index 587fc13197f1..1d58d6b626a5 100644 --- a/drivers/iommu/virtio-iommu.c +++ b/drivers/iommu/virtio-iommu.c @@ -486,7 +486,8 @@ static int viommu_add_resv_mem(struct viommu_endpoint *vdev, size_t size; u64 start64, end64; phys_addr_t start, end; - struct iommu_resv_region *region = NULL, *next; + struct iommu_resv_region *region = NULL; + struct list_head *pos; unsigned long prot = IOMMU_WRITE | IOMMU_NOEXEC | IOMMU_MMIO; start = start64 = le64_to_cpu(mem->start); @@ -520,11 +521,14 @@ static int viommu_add_resv_mem(struct viommu_endpoint *vdev, return -ENOMEM; /* Keep the list sorted */ - list_for_each_entry(next, &vdev->resv_regions, list) { + list_for_each(pos, &vdev->resv_regions) { + struct iommu_resv_region *next = + list_entry(pos, struct iommu_resv_region, list); + if (next->start > region->start) break; } - list_add_tail(®ion->list, &next->list); + list_add_tail(®ion->list, pos); return 0; } -- 2.34.1