From nobody Wed Dec 17 23:55:11 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C98AC04A6A for ; Wed, 16 Aug 2023 03:08:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241502AbjHPDHr (ORCPT ); Tue, 15 Aug 2023 23:07:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241549AbjHPDHh (ORCPT ); Tue, 15 Aug 2023 23:07:37 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3D4FE6B; Tue, 15 Aug 2023 20:07:35 -0700 (PDT) Received: from kwepemi500012.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RQXz61nNpzNmsS; Wed, 16 Aug 2023 11:04:02 +0800 (CST) Received: from huawei.com (10.67.174.28) by kwepemi500012.china.huawei.com (7.221.188.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 16 Aug 2023 11:07:33 +0800 From: Liao Chang To: , CC: , Subject: [PATCH] cpufreq: cppc: Add missing error pointer check Date: Wed, 16 Aug 2023 03:05:49 +0000 Message-ID: <20230816030549.849824-1-liaochang1@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.174.28] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemi500012.china.huawei.com (7.221.188.12) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function cppc_freq_invariance_init() may failed to create kworker_fie, make it more robust by checking the return value to prevent an invalid pointer dereference in kthread_destroy_worker(), which called from cppc_freq_invariance_exit(). Signed-off-by: Liao Chang --- drivers/cpufreq/cppc_cpufreq.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index 022e3555407c..4432398c8592 100644 --- a/drivers/cpufreq/cppc_cpufreq.c +++ b/drivers/cpufreq/cppc_cpufreq.c @@ -220,7 +220,7 @@ static void cppc_cpufreq_cpu_fie_exit(struct cpufreq_po= licy *policy) } } =20 -static void __init cppc_freq_invariance_init(void) +static int __init cppc_freq_invariance_init(void) { struct sched_attr attr =3D { .size =3D sizeof(struct sched_attr), @@ -246,19 +246,23 @@ static void __init cppc_freq_invariance_init(void) } =20 if (fie_disabled) - return; + return 0; =20 kworker_fie =3D kthread_create_worker(0, "cppc_fie"); - if (IS_ERR(kworker_fie)) - return; + if (IS_ERR(kworker_fie)) { + ret =3D PTR_ERR(kworker_fie); + kworker_fie =3D NULL; + return ret; + } =20 ret =3D sched_setattr_nocheck(kworker_fie->task, &attr); if (ret) { pr_warn("%s: failed to set SCHED_DEADLINE: %d\n", __func__, ret); kthread_destroy_worker(kworker_fie); - return; + kworker_fie =3D NULL; } + return ret; } =20 static void cppc_freq_invariance_exit(void) @@ -279,8 +283,9 @@ static inline void cppc_cpufreq_cpu_fie_exit(struct cpu= freq_policy *policy) { } =20 -static inline void cppc_freq_invariance_init(void) +static inline int cppc_freq_invariance_init(void) { + return 0; } =20 static inline void cppc_freq_invariance_exit(void) @@ -969,7 +974,9 @@ static int __init cppc_cpufreq_init(void) return -ENODEV; =20 cppc_check_hisi_workaround(); - cppc_freq_invariance_init(); + ret =3D cppc_freq_invariance_init(); + if (ret < 0) + return ret; populate_efficiency_class(); =20 ret =3D cpufreq_register_driver(&cppc_cpufreq_driver); --=20 2.34.1