From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753971AbbGVWF7 (ORCPT ); Wed, 22 Jul 2015 18:05:59 -0400 Received: from mail-yk0-f179.google.com ([209.85.160.179]:35347 "EHLO mail-yk0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753524AbbGVWF4 (ORCPT ); Wed, 22 Jul 2015 18:05:56 -0400 Date: Wed, 22 Jul 2015 18:05:53 -0400 From: Tejun Heo To: Jens Axboe Cc: linux-kernel@vger.kernel.org Subject: [PATCH block/for-linus] blkcg: fix gendisk reference leak in blkg_conf_prep() Message-ID: <20150722220553.GO15934@mtj.duckdns.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: stable@vger.kernel.org --- block/blk-cgroup.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -791,8 +791,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);