diff options
| author | Tejun Heo <tj@kernel.org> | 2015-07-22 18:05:53 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-07-22 16:06:53 -0600 |
| commit | 5f6c2d2b7dbb541c1e922538c49fa04c494ae3d7 (patch) | |
| tree | e248b438d0302d71700c38cc5dfa40d85f81b76b /block | |
| parent | 21974061cfb3c4b0b1a83447fb5e7cdcd06e56dc (diff) | |
| download | linux-stable-5f6c2d2b7dbb541c1e922538c49fa04c494ae3d7.tar.gz linux-stable-5f6c2d2b7dbb541c1e922538c49fa04c494ae3d7.tar.bz2 linux-stable-5f6c2d2b7dbb541c1e922538c49fa04c494ae3d7.zip | |
blkcg: fix gendisk reference leak in blkg_conf_prep()
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>
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -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); |