From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Wed, 3 Sep 2008 23:58:34 +0000 (-0700)
Subject: dmar: use list_for_each_entry_safe() in dmar_dev_scope_init()
X-Git-Tag: Ubuntu-5.10.0-12.13~35889^2~65
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=04e2ea67069e285404192a35c24dfe7c53b9c61f;p=mirror_ubuntu-hirsute-kernel.git

dmar: use list_for_each_entry_safe() in dmar_dev_scope_init()

In dmar_dev_scope_init(), functions called under for_each_drhd_unit()/
for_each_rmrr_units() can delete the list entry under some error conditions.

So we should use list_for_each_entry_safe() for safe traversal.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Acked-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index d281a03695f7..ceb338dfa3f2 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -397,10 +397,10 @@ dmar_find_matched_drhd_unit(struct pci_dev *dev)
 
 int __init dmar_dev_scope_init(void)
 {
-	struct dmar_drhd_unit *drhd;
+	struct dmar_drhd_unit *drhd, *drhd_n;
 	int ret = -ENODEV;
 
-	for_each_drhd_unit(drhd) {
+	list_for_each_entry_safe(drhd, drhd_n, &dmar_drhd_units, list) {
 		ret = dmar_parse_dev(drhd);
 		if (ret)
 			return ret;
@@ -408,8 +408,8 @@ int __init dmar_dev_scope_init(void)
 
 #ifdef CONFIG_DMAR
 	{
-		struct dmar_rmrr_unit *rmrr;
-		for_each_rmrr_units(rmrr) {
+		struct dmar_rmrr_unit *rmrr, *rmrr_n;
+		list_for_each_entry_safe(rmrr, rmrr_n, &dmar_rmrr_units, list) {
 			ret = rmrr_parse_dev(rmrr);
 			if (ret)
 				return ret;