Skip to contentSkip to conversation

omap: resource: Fix race in register_resource()

PATCH In review Mike Chan 2 participants 3 messages Sep 3, 2009 – Sep 9, 2009

Subsystems (2)
lore
Share & tools
lore

Mike Chan

author
#0 lore raw

PATCH 1/1 omap: resource: Fix race in register_resource()

Checking if the resource is already registered and adding to the list must be atomic or bad things can happen.

---
 arch/arm/plat-omap/resource.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
arch/arm/plat-omap/resource.c +9 -5
index e9ace13..9d20249 100644
@@ -253,6 +253,7 @@ int resource_refresh(void)
  */
 int resource_register(struct shared_resource *resp)
 {
+	int ret = 0;
 	if (!resp)
 		return -EINVAL;
 
@@ -260,13 +261,15 @@ int resource_register(struct shared_resource *resp)
 		return -EINVAL;
 
 	/* Verify that the resource is not already registered */
-	if (resource_lookup(resp->name))
-		return -EEXIST;
+	down(&res_mutex);
+	if (_resource_lookup(resp->name)) {
+		ret = -EEXIST;
+		goto out;
+	}
 
 	INIT_LIST_HEAD(&resp->users_list);
 	mutex_init(&resp->resource_mutex);
 
-	down(&res_mutex);
 	/* Add the resource to the resource list */
 	list_add(&resp->node, &res_list);
 
@@ -274,10 +277,11 @@ int resource_register(struct shared_resource *resp)
 	if (resp->ops->init)
 		resp->ops->init(resp);
 
-	up(&res_mutex);
 	pr_debug("resource: registered %s\n", resp->name);
 
-	return 0;
+out:
+	up(&res_mutex);
+	return ret;
 }
 EXPORT_SYMBOL(resource_register);
 
Signature · 1 line
1.5.4.5
#1 lore raw
Quoted 4 lines · Mike Chan

Checking if the resource is already registered and adding to the list must be atomic or bad things can happen.

Functionally, this looks fine. Some procedural details still to work out:

Are you the original author of this? or was it Chunqiu or Limei? The changelog should be prefixed with a From: line of the original author (handled by git-format-patch) if it was not you. Also add the other's signoffs if appropriate.

What tree does this apply to? It's not specified, and does not apply to either current PM branch or pm-2.6.29.

Kevin

Quoted 51 lines
---
 arch/arm/plat-omap/resource.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
arch/arm/plat-omap/resource.c +9 -5
index e9ace13..9d20249 100644
@@ -253,6 +253,7 @@ int resource_refresh(void)
  */
 int resource_register(struct shared_resource *resp)
 {
+	int ret = 0;
 	if (!resp)
 		return -EINVAL;
 
@@ -260,13 +261,15 @@ int resource_register(struct shared_resource *resp)
 		return -EINVAL;
 
 	/* Verify that the resource is not already registered */
-	if (resource_lookup(resp->name))
-		return -EEXIST;
+	down(&res_mutex);
+	if (_resource_lookup(resp->name)) {
+		ret = -EEXIST;
+		goto out;
+	}
 
 	INIT_LIST_HEAD(&resp->users_list);
 	mutex_init(&resp->resource_mutex);
 
-	down(&res_mutex);
 	/* Add the resource to the resource list */
 	list_add(&resp->node, &res_list);
 
@@ -274,10 +277,11 @@ int resource_register(struct shared_resource *resp)
 	if (resp->ops->init)
 		resp->ops->init(resp);
 
-	up(&res_mutex);
 	pr_debug("resource: registered %s\n", resp->name);
 
-	return 0;
+out:
+	up(&res_mutex);
+	return ret;
 }
 EXPORT_SYMBOL(resource_register);
 
Signature · 1 line
1.5.4.5
author
#2 lore raw
Quoted 7 lines · Kevin Hilman
Quoted 4 lines · Mike Chan

Checking if the resource is already registered and adding to the list must be atomic or bad things can happen.

Quoted 8 lines

Functionally, this looks fine.  Some procedural details still to work out:

Are you the original author of this?  or was it Chunqiu or Limei?  The changelog should be prefixed with a From: line of the original author (handled by git-format-patch) if it was not you.  Also add the other's signoffs if appropriate.

I am the original author of this patch. Chunqiu sent two patches out
1) a per-resource level mutex (vs global).
2) Make update_resource_level() thread safe.

I've been meaning to send them out to l-o on behalf of Chunqiu.

Quoted 3 lines

What tree does this apply to?  It's not specified, and does not apply to either current PM branch or pm-2.6.29.

I thought I rebased this off of pm but I may have goofed. I can send a new one.

-- Mike

Quoted 51 lines

Kevin

Quoted 49 lines

---
 arch/arm/plat-omap/resource.c |   14 +++++++++-----

 1 files changed, 9 insertions(+), 5 deletions(-)
arch/arm/plat-omap/resource.c +9 -5
index e9ace13..9d20249 100644
@@ -253,6 +253,7 @@ int resource_refresh(void)
   */
  int resource_register(struct shared_resource *resp)
  {
+     int ret = 0;
       if (!resp)
               return -EINVAL;
 
@@ -260,13 +261,15 @@ int resource_register(struct shared_resource *resp)
               return -EINVAL;
 
       /* Verify that the resource is not already registered */
-     if (resource_lookup(resp->name))
-             return -EEXIST;
+     down(&res_mutex);
+     if (_resource_lookup(resp->name)) {
+             ret = -EEXIST;
+             goto out;
+     }
 
       INIT_LIST_HEAD(&resp->users_list);
       mutex_init(&resp->resource_mutex);
 
-     down(&res_mutex);
       /* Add the resource to the resource list */
       list_add(&resp->node, &res_list);
 
@@ -274,10 +277,11 @@ int resource_register(struct shared_resource *resp)
       if (resp->ops->init)
               resp->ops->init(resp);
 
-     up(&res_mutex);
       pr_debug("resource: registered %s\n", resp->name);
 
-     return 0;
+out:
+     up(&res_mutex);
+     return ret;
  }
  EXPORT_SYMBOL(resource_register);
 
Quoted 3 lines
Quoted 2 lines

--
1.5.4.5

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html