diff options
| author | Tejun Heo <tj@kernel.org> | 2015-07-22 18:05:53 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-10 12:21:05 -0700 |
| commit | bdae476bfc87b92414a633211194e21100163404 (patch) | |
| tree | 50a9f51a9cb67513897f40e74e69ea9079658f1d | |
| parent | 2670fc6fb3c98b75bf30a82c84ea0e89f268a811 (diff) | |
| download | linux-stable-bdae476bfc87b92414a633211194e21100163404.tar.gz linux-stable-bdae476bfc87b92414a633211194e21100163404.tar.bz2 linux-stable-bdae476bfc87b92414a633211194e21100163404.zip | |
blkcg: fix gendisk reference leak in blkg_conf_prep()
commit 5f6c2d2b7dbb541c1e922538c49fa04c494ae3d7 upstream.
When a blkcg configuration is targeted to a partition rather than a
whole device, blkg_conf_prep fails with -EINVAL; unfortunately, it
forgets to put the gendisk ref in that case. Fix it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 d8f80e733cf8..a7175855b6ed 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -703,8 +703,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); |