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=unavailable 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 321CCC282CE for ; Wed, 22 May 2019 19:40:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 047E120675 for ; Wed, 22 May 2019 19:40:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558554050; bh=marLfl6E2Vvvg0201mP1qVHGUomZsSlOW9WP/DtMf9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GcAred3Su+BNMyV1ApdoPh7kkxdzr3K20g2ClsKj8DGe/UZbCg5Aa0CH9MLSgUv70 5N95BpXHR1iT3KCujQjxZHwXp0OJIGD9BJiL0uGf9RCo3F4IDEdJ0xiZunbV1kjfwG gkvw0z7LvVQBTTzRZeELHNZH2tD4ZURTa4RU88Uo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732825AbfEVT3U (ORCPT ); Wed, 22 May 2019 15:29:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:52324 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732820AbfEVT3U (ORCPT ); Wed, 22 May 2019 15:29:20 -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 65FF82173C; Wed, 22 May 2019 19:29:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558553359; bh=marLfl6E2Vvvg0201mP1qVHGUomZsSlOW9WP/DtMf9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xYJnc8Jnx4k3KO1oPYzoqQZ0wPslUiBPV20ra1P9Lo2Y+tidvj0STyTsPBqnr9r8o C8cz6x2CjDk+3GublSDu86GF8zF4ZV80Jgrb+KDhvF2RUTUjYDgfMF0PEOYZjIWPyM 3f9GGUCkiqvO+sp8gqq8Xh+hw08v8xmN2Rpfufm0= 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.14 022/167] sched/cpufreq: Fix kobject memleak Date: Wed, 22 May 2019 15:26:17 -0400 Message-Id: <20190522192842.25858-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190522192842.25858-1-sashal@kernel.org> References: <20190522192842.25858-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 9f5c51cd67ad9..fceb18d26db8e 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1101,6 +1101,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 6a16d22bc6043..146237aab395d 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c @@ -459,6 +459,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