Browse Source

arch/x86/kernel: Add missing spin_unlock

Add a spin_unlock missing on the error path.  The locks and unlocks are
balanced in other functions, so it seems that the same should be the case
here.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression E1;
@@

* spin_lock(E1,...);
  <+... when != E1
  if (...) {
    ... when != E1
*   return ...;
  }
  ...+>
* spin_unlock(E1,...);
// </smpl>

Cc: stable@kernel.org
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Julia Lawall 15 years ago
parent
commit
84fe6c19e4
1 changed files with 9 additions and 3 deletions
  1. 9 3
      arch/x86/kernel/amd_iommu.c

+ 9 - 3
arch/x86/kernel/amd_iommu.c

@@ -1487,6 +1487,7 @@ static int __attach_device(struct device *dev,
 			   struct protection_domain *domain)
 			   struct protection_domain *domain)
 {
 {
 	struct iommu_dev_data *dev_data, *alias_data;
 	struct iommu_dev_data *dev_data, *alias_data;
+	int ret;
 
 
 	dev_data   = get_dev_data(dev);
 	dev_data   = get_dev_data(dev);
 	alias_data = get_dev_data(dev_data->alias);
 	alias_data = get_dev_data(dev_data->alias);
@@ -1498,13 +1499,14 @@ static int __attach_device(struct device *dev,
 	spin_lock(&domain->lock);
 	spin_lock(&domain->lock);
 
 
 	/* Some sanity checks */
 	/* Some sanity checks */
+	ret = -EBUSY;
 	if (alias_data->domain != NULL &&
 	if (alias_data->domain != NULL &&
 	    alias_data->domain != domain)
 	    alias_data->domain != domain)
-		return -EBUSY;
+		goto out_unlock;
 
 
 	if (dev_data->domain != NULL &&
 	if (dev_data->domain != NULL &&
 	    dev_data->domain != domain)
 	    dev_data->domain != domain)
-		return -EBUSY;
+		goto out_unlock;
 
 
 	/* Do real assignment */
 	/* Do real assignment */
 	if (dev_data->alias != dev) {
 	if (dev_data->alias != dev) {
@@ -1520,10 +1522,14 @@ static int __attach_device(struct device *dev,
 
 
 	atomic_inc(&dev_data->bind);
 	atomic_inc(&dev_data->bind);
 
 
+	ret = 0;
+
+out_unlock:
+
 	/* ready */
 	/* ready */
 	spin_unlock(&domain->lock);
 	spin_unlock(&domain->lock);
 
 
-	return 0;
+	return ret;
 }
 }
 
 
 /*
 /*