Patchwork mtd: mtd_blkdevs: fix error path in blktrans_open

login
register
mail settings
Submitter Artem Bityutskiy
Date April 18, 2011, 5:04 a.m.
Message ID <1303103096-4958-1-git-send-email-dedekind1@gmail.com>
Download mbox | patch
Permalink /patch/91682/
State Accepted
Commit 94735ec4044a6d318b83ad3c5794e931ed168d10
Headers show

Comments

Artem Bityutskiy - April 18, 2011, 5:02 a.m.
On Mon, 2011-04-18 at 08:04 +0300, Artem Bityutskiy wrote:
> From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
> 
> The 'blktrans_open()' does not handle possible '__get_mtd_device()' failures
> because it does not check the error code. Moreover, the 'dev->tr->open()'
> failures are not handled correctly because in this case the function just
> goes ahead and gets the mtd device but returns an error. Instead, it should
> _not_ try to get the mtd device, then it should put back the module and kref.
> 
> This patch fixes the issue. Note, I only compile-test it but did not test.
> This patch was inspired bug report about a similar issue in 2.6.34 kernels
> sent by Mike Turner <admin@islandsoftware.co.uk> to the MTD mailing list:
> 
> http://lists.infradead.org/pipermail/linux-mtd/2011-April/034980.html
> 
> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

Fixed typos in the commit message:

This patch fixes the issue. Note, I only compile-tested it. This patch was
inspired by a bug report about a similar issue in 2.6.34 kernels
sent by Mike Turner <admin@islandsoftware.co.uk> to the MTD mailing list:
Artem Bityutskiy - April 18, 2011, 5:04 a.m.
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

The 'blktrans_open()' does not handle possible '__get_mtd_device()' failures
because it does not check the error code. Moreover, the 'dev->tr->open()'
failures are not handled correctly because in this case the function just
goes ahead and gets the mtd device but returns an error. Instead, it should
_not_ try to get the mtd device, then it should put back the module and kref.

This patch fixes the issue. Note, I only compile-test it but did not test.
This patch was inspired bug report about a similar issue in 2.6.34 kernels
sent by Mike Turner <admin@islandsoftware.co.uk> to the MTD mailing list:

http://lists.infradead.org/pipermail/linux-mtd/2011-April/034980.html

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---
 drivers/mtd/mtd_blkdevs.c |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index a534e1f..ca38569 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -221,15 +221,33 @@  static int blktrans_open(struct block_device *bdev, fmode_t mode)
 	kref_get(&dev->ref);
 	__module_get(dev->tr->owner);
 
-	if (dev->mtd) {
-		ret = dev->tr->open ? dev->tr->open(dev) : 0;
-		__get_mtd_device(dev->mtd);
+	if (!dev->mtd)
+		goto unlock;
+
+	if (dev->tr->open) {
+		ret = dev->tr->open(dev);
+		if (ret)
+			goto error_put;
 	}
 
+	ret = __get_mtd_device(dev->mtd);
+	if (ret)
+		goto error_release;
+
 unlock:
 	mutex_unlock(&dev->lock);
 	blktrans_dev_put(dev);
 	return ret;
+
+error_release:
+	if (dev->tr->release)
+		dev->tr->release(dev);
+error_put:
+	module_put(dev->tr->owner);
+	kref_put(&dev->ref, blktrans_dev_release);
+	mutex_unlock(&dev->lock);
+	blktrans_dev_put(dev);
+	return ret;
 }
 
 static int blktrans_release(struct gendisk *disk, fmode_t mode)