[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.64.1005261755260.23743@ask.diku.dk>
Date: Wed, 26 May 2010 17:55:59 +0200 (CEST)
From: Julia Lawall <julia@...u.dk>
To: Joerg Roedel <joerg.roedel@....com>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>, x86@...nel.org,
iommu@...ts.linux-foundation.org, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: [PATCH 6/17] arch/x86/kernel: Add missing spin_unlock
From: Julia Lawall <julia@...u.dk>
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>
Signed-off-by: Julia Lawall <julia@...u.dk>
---
arch/x86/kernel/amd_iommu.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index fa5a147..b98e1cd 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -1499,12 +1499,16 @@ static int __attach_device(struct device *dev,
/* Some sanity checks */
if (alias_data->domain != NULL &&
- alias_data->domain != domain)
+ alias_data->domain != domain) {
+ spin_unlock(&domain->lock);
return -EBUSY;
+ }
if (dev_data->domain != NULL &&
- dev_data->domain != domain)
+ dev_data->domain != domain) {
+ spin_unlock(&domain->lock);
return -EBUSY;
+ }
/* Do real assignment */
if (dev_data->alias != dev) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists