diff options
author | Dan Carpenter <error27@gmail.com> | 2011-03-19 13:53:31 +0100 |
---|---|---|
committer | Jens Axboe <axboe@carl> | 2011-03-19 13:53:31 +0100 |
commit | 4345caba340f051e10847924fc078ae18ed6695c (patch) | |
tree | aada9145e21b79f31129281bf7d1bb33a1710fbb /fs | |
parent | 8184f93eced1e304721c2a55c00d87d5a14f8907 (diff) | |
download | lwn-4345caba340f051e10847924fc078ae18ed6695c.tar.gz lwn-4345caba340f051e10847924fc078ae18ed6695c.zip |
block: NULL dereference on error path in __blkdev_get()
"disk" is always NULL when we goto out. There was a check for this
before, but it was removed in 69e02c59a7d9 "block: Don't check events
while open is in progress".
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@carl>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/block_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index fbe05cbdd692..7d02afb2b7f4 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1181,9 +1181,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) out_unlock_bdev: mutex_unlock(&bdev->bd_mutex); disk_unblock_events(disk); - out: module_put(disk->fops->owner); put_disk(disk); + out: bdput(bdev); return ret; |