diff options
| author | Neil Brown <neilb@suse.de> | 2009-10-26 08:59:17 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-26 15:27:11 +0100 |
| commit | 960cc0f4fef607baabc2232fbd7cce5368a9dcfd (patch) | |
| tree | 5920396618a0c1cf406b999d2cf5b68eafcdd7e8 /fs/block_dev.c | |
| parent | 6cafb12dc85a5bdc722791cc5070968413264909 (diff) | |
| download | blackbird-op-linux-960cc0f4fef607baabc2232fbd7cce5368a9dcfd.tar.gz blackbird-op-linux-960cc0f4fef607baabc2232fbd7cce5368a9dcfd.zip | |
block: use after free bug in __blkdev_get
commit 0762b8bde9729f10f8e6249809660ff2ec3ad735
(from 14 months ago) introduced a use-after-free bug which has just
recently started manifesting in my md testing.
I tried git bisect to find out what caused the bug to start
manifesting, and it could have been the recent change to
blk_unregister_queue (48c0d4d4c04) but the results were inconclusive.
This patch certainly fixes my symptoms and looks correct as the two
calls are now in the same order as elsewhere in that function.
Signed-off-by: NeilBrown <neilb@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/block_dev.c')
| -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 9cf4b926f8e4..8bed0557d88c 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1248,8 +1248,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) bd_set_size(bdev, (loff_t)bdev->bd_part->nr_sects << 9); } } else { - put_disk(disk); module_put(disk->fops->owner); + put_disk(disk); disk = NULL; if (bdev->bd_contains == bdev) { if (bdev->bd_disk->fops->open) { |
