Skip to contentSkip to conversation

FMC: fix locking in sample chardev driver

PATCH New Alessandro Rubini 1 participant 1 message Jul 16, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 FMC: fix locking in sample chardev driver

The fmc-chardev module was over-locking, by calling misc register/unregister while holding its spinlock. This reported a "scheduling while atomic" error.

Since the misc driver already serializes operations internally, this commit downgrades the fmc-chardev lock to just cover its own list.

---
 drivers/fmc/fmc-chardev.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
drivers/fmc/fmc-chardev.c +4 -5
index cc031db..ace6ef2 100644
@@ -143,18 +143,17 @@ static int fc_probe(struct fmc_device *fmc)
 	fc->misc.fops = &fc_fops;
 	fc->misc.name = kstrdup(dev_name(&fmc->dev), GFP_KERNEL);
 
-	spin_lock(&fc_lock);
 	ret = misc_register(&fc->misc);
 	if (ret < 0)
-		goto err_unlock;
+		goto out;
+	spin_lock(&fc_lock);
 	list_add(&fc->list, &fc_devices);
 	spin_unlock(&fc_lock);
 	dev_info(&fc->fmc->dev, "Created misc device \"%s\"\n",
 		 fc->misc.name);
 	return 0;
 
-err_unlock:
-	spin_unlock(&fc_lock);
+out:
 	kfree(fc->misc.name);
 	kfree(fc);
 	return ret;
@@ -174,10 +173,10 @@ static int fc_remove(struct fmc_device *fmc)
 
 	spin_lock(&fc_lock);
 	list_del(&fc->list);
+	spin_unlock(&fc_lock);
 	misc_deregister(&fc->misc);
 	kfree(fc->misc.name);
 	kfree(fc);
-	spin_unlock(&fc_lock);
 
 	return 0;
 }
Signature · 1 line
1.7.7.2