diff options
| author | Tejun Heo <tj@kernel.org> | 2015-07-23 01:05:53 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-08-27 20:25:46 +0300 |
| commit | 595422856699eec52732e03d3711c7045ab96f08 (patch) | |
| tree | 72042b53fdc7f882daae17410ab5bb2ed2119997 | |
| parent | 1d9103f6387b1174d769e2f87802af1bd8a7563a (diff) | |
| download | linux-595422856699eec52732e03d3711c7045ab96f08.tar.xz | |
blkcg: fix gendisk reference leak in blkg_conf_prep()
[ Upstream commit 5f6c2d2b7dbb541c1e922538c49fa04c494ae3d7 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -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 0ac817b750db..6817e28960b7 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -716,8 +716,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); |