commit 6a2aae06cc1e87e9712a26a639f6a2f3442e2027
author Pavel Emelianov <xemul@openvz.org> Sat Oct 28 10:38:33 2006 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat Oct 28 11:30:52 2006 -0700
tree 6c9e0f73d39646670c301e19ccd8b33d3aa3a293
parent f2d0aa5bf8d4f7ae4cb1a7feebf5b1afddd0b9b0

[PATCH] Fix potential OOPs in blkdev_open()

blkdev_open() calls bc_acquire() to get a struct block_device.  Since
bc_acquire() may return NULL when system is out of memory an appropriate
check is required.

Signed-off-by: Pavel Emelianov <xemul@openvz.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fs/block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index bc8f27c..702b88c 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1131,6 +1131,8 @@
 	filp->f_flags |= O_LARGEFILE;
 
 	bdev = bd_acquire(inode);
+	if (bdev == NULL)
+		return -ENOMEM;
 
 	res = do_open(bdev, filp, BD_MUTEX_NORMAL);
 	if (res)