diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 03:00:04 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 03:00:04 +0300 |
| commit | 33b40178cb3bd75294d1a758b3f509a0d38682ab (patch) | |
| tree | d5c29280f425cfbcd6f6ca247b2a776c8f787cec /block/blk-cgroup.c | |
| parent | 9fbf075c96fe09719f857c5abcf7b3138f5e0855 (diff) | |
| parent | f3f5da624e0a891c34d8cd513c57f1d9b0c7dadc (diff) | |
| download | linux-33b40178cb3bd75294d1a758b3f509a0d38682ab.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Four smaller fixes for the current series. This contains:
- A fix for clones of discard bio's, that can cause data corruption.
From Martin.
- A fix for null_blk, where in certain queue modes it could access a
request after it had been freed. From Mike Krinkin.
- An error handling leak fix for blkcg, from Tejun.
- Also from Tejun, export of the functions that a file system needs
to implement cgroup writeback support"
* 'for-linus' of git://git.kernel.dk/linux-block:
block: Do a full clone when splitting discard bios
block: export bio_associate_*() and wbc_account_io()
blkcg: fix gendisk reference leak in blkg_conf_prep()
null_blk: fix use-after-free problem
Diffstat (limited to 'block/blk-cgroup.c')
| -rw-r--r-- | block/blk-cgroup.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 9da02c021ebe..d6283b3f5db5 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -718,8 +718,12 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, return -EINVAL; disk = get_gendisk(MKDEV(major, minor), &part); - if (!disk || part) + if (!disk) return -EINVAL; + if (part) { + put_disk(disk); + return -EINVAL; + } rcu_read_lock(); spin_lock_irq(disk->queue->queue_lock); |