Patch "blkcg: fix gendisk reference leak in blkg_conf_prep()" has been added to the 3.10-stable tree

Patch "blkcg: fix gendisk reference leak in blkg_conf_prep()" has been added to the 3.10-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    blkcg: fix gendisk reference leak in blkg_conf_prep()

to the 3.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     blkcg-fix-gendisk-reference-leak-in-blkg_conf_prep.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 5f6c2d2b7dbb541c1e922538c49fa04c494ae3d7 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 22 Jul 2015 18:05:53 -0400
Subject: blkcg: fix gendisk reference leak in blkg_conf_prep()

From: Tejun Heo <tj@kernel.org>

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>

---
 block/blk-cgroup.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -720,8 +720,12 @@ int blkg_conf_prep(struct blkcg *blkcg,
 		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);


Patches currently in stable-queue which might be from tj@kernel.org are

queue-3.10/blkcg-fix-gendisk-reference-leak-in-blkg_conf_prep.patch
queue-3.10/ata-pmp-add-quirk-for-marvell-4140-sata-pmp.patch