Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f6c2d2b authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 21974061

block/blk-cgroup.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -718,8 +718,12 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, 
		return -EINVAL;

		return -EINVAL;





	disk = get_gendisk(MKDEV(major, minor), &part);

	disk = get_gendisk(MKDEV(major, minor), &part);

	if (!disk || part)

	if (!disk)

		return -EINVAL;

		return -EINVAL;

	if (part) {

		put_disk(disk);

		return -EINVAL;

	}





	rcu_read_lock();

	rcu_read_lock();

	spin_lock_irq(disk->queue->queue_lock);

	spin_lock_irq(disk->queue->queue_lock);