[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <E1PscVt-0004ad-W9@pomaz-ex.szeredi.hu>
Date: Thu, 24 Feb 2011 15:49:53 +0100
From: Miklos Szeredi <miklos@...redi.hu>
To: akpm@...ux-foundation.org, torvalds@...ux-foundation.org
CC: rjw@...k.pl, tj@...nel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] mm: fix refcounting in swapon
From: Miklos Szeredi <mszeredi@...e.cz>
Grab a reference to bdev before calling blkdev_get(), which expects
the refcount to be already incremented and either returns success or
decrements the refcount and returns an error.
The bug was introduced by e525fd89 (block: make blkdev_get/put()
handle exclusive access), which didn't take into account this behavior
of blkdev_get().
CC: Tejun Heo <tj@...nel.org>
Signed-off-by: Miklos Szeredi <mszeredi@...e.cz>
---
mm/swapfile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux.git/mm/swapfile.c
===================================================================
--- linux.git.orig/mm/swapfile.c 2011-02-24 15:29:26.000000000 +0100
+++ linux.git/mm/swapfile.c 2011-02-24 15:32:31.000000000 +0100
@@ -1940,7 +1940,7 @@ SYSCALL_DEFINE2(swapon, const char __use
error = -EINVAL;
if (S_ISBLK(inode->i_mode)) {
- bdev = I_BDEV(inode);
+ bdev = bdgrab(I_BDEV(inode));
error = blkdev_get(bdev, FMODE_READ | FMODE_WRITE | FMODE_EXCL,
sys_swapon);
if (error < 0) {
--
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