From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58772C282CE for ; Wed, 22 May 2019 19:30:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A6BA2184E for ; Wed, 22 May 2019 19:30:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553455; bh=shTTSno3Vmfm+DSV2fIEsrskFZGxkjejRLHNEOTct/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZKzlFvFhh6B9V9WH4Wl15Q4gnSV3ulqHte1oPkaOSzAO1EcSj4UtWM6kd2vDdcE/k 1n4HtAN2gtZTCHJMjgfTs5s+iXTsAA3g53Qlmg46K1YSGO7qhmQyGsV/RpZJVE7141 pIZ9f7mcPaUHhXKLfrJKnXDFNn0VrS6lvovdW5zA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732544AbfEVTax (ORCPT ); Wed, 22 May 2019 15:30:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:54168 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733290AbfEVTan (ORCPT ); Wed, 22 May 2019 15:30:43 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BBDCA204FD; Wed, 22 May 2019 19:30:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553443; bh=shTTSno3Vmfm+DSV2fIEsrskFZGxkjejRLHNEOTct/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lx8ITbMUV1l7359/9KIvpqM6g5JapaF5DbHJ2L3cLZZKCO1akoewoCBjfZjrz5j+q KmdZX9Z7hhT1MeiOf29HFWQARk3TeuUc4ZEm3Rrzuxn7bgPdCRhNNNEtHGRU2rN0vb O9+kGdohmNxPCZbw+IbOAWGerN9ZPzXWEZnPtB3M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Viresh Kumar , "Tobin C . Harding" , Greg Kroah-Hartman , Linus Torvalds , Peter Zijlstra , "Rafael J . Wysocki" , Thomas Gleixner , Vincent Guittot , Ingo Molnar , Sasha Levin , linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 014/114] sched/cpufreq: Fix kobject memleak Date: Wed, 22 May 2019 15:28:37 -0400 Message-Id: <20190522193017.26567-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522193017.26567-1-sashal@kernel.org> References: <20190522193017.26567-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Viresh Kumar [ Upstream commit 9a4f26cc98d81b67ecc23b890c28e2df324e29f3 ] Currently the error return path from kobject_init_and_add() is not followed by a call to kobject_put() - which means we are leaking the kobject. Fix it by adding a call to kobject_put() in the error path of kobject_init_and_add(). Signed-off-by: Tobin C. Harding Cc: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Thomas Gleixner Cc: Tobin C. Harding Cc: Vincent Guittot Cc: Viresh Kumar Link: http://lkml.kernel.org/r/20190430001144.24890-1-tobin@kernel.org Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- drivers/cpufreq/cpufreq.c | 1 + drivers/cpufreq/cpufreq_governor.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index a38a23f0b3f41..e917521a3ef9b 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1065,6 +1065,7 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) cpufreq_global_kobject, "policy%u", cpu); if (ret) { pr_err("%s: failed to init policy->kobj: %d\n", __func__, ret); + kobject_put(&policy->kobj); goto err_free_real_cpus; } diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c index 38d1a8216084c..32c9524a6ec54 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c @@ -449,6 +449,8 @@ int cpufreq_dbs_governor_init(struct cpufreq_policy *policy) /* Failure, so roll back. */ pr_err("initialization failed (dbs_data kobject init error %d)\n", ret); + kobject_put(&dbs_data->attr_set.kobj); + policy->governor_data = NULL; if (!have_governor_per_policy()) -- 2.20.1