Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2993806AbbHHWpI (ORCPT ); Sat, 8 Aug 2015 18:45:08 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36082 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992940AbbHHWIE (ORCPT ); Sat, 8 Aug 2015 18:08:04 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tejun Heo , Jens Axboe Subject: [PATCH 3.14 16/29] blkcg: fix gendisk reference leak in blkg_conf_prep() Date: Sat, 8 Aug 2015 15:07:39 -0700 Message-Id: <20150808220718.882186320@linuxfoundation.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <20150808220718.247950412@linuxfoundation.org> References: <20150808220718.247950412@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1214 Lines: 43 3.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tejun Heo 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 Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- block/blk-cgroup.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -703,8 +703,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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/