Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2189307iof; Tue, 7 Jun 2022 22:38:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6JTghR/pzjnJf+m57zAMM+N6Q3fnlV5qvIwlod0+1DH0N0rZ+fgCh4JpEVDx9q4lXEDpe X-Received: by 2002:a17:903:2592:b0:168:9708:ad73 with SMTP id jb18-20020a170903259200b001689708ad73mr1158831plb.59.1654666717509; Tue, 07 Jun 2022 22:38:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654666717; cv=none; d=google.com; s=arc-20160816; b=pGFygKENvBBjH9hmdyJQi82NiHWwjKxj4dG1mU6VbB4QLzcyXskvy6Z93uXh5xhMen ULh9vL3eXotwFjwxs1L+SPHAyL4+OjwATloTGPHI7FRQmIn0rmrZwg+Jze9Dohc29Su0 ShatPOATQkwkLC19Lxjt5+RblEw67m8iPV6WGdTvpAeghVFa7EeTOma4JDOoecRbnFKF 55+l3jjUDySnghO27GV0lw1o0AdTC0k+GtNh0UXdyOAFBFXUqa1+HkpIbnKR5prX4psi peB3HCbO5fwxCR42XiMUC9Ngj+bX+3RM6Ri0UmZo02le8oajJmyD98eV7VHbLXvaoWhe oFrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kXjIxW2xSd7XnnuqSywM9D7ppdOYlc1UM37QZAOY500=; b=Q2g5AEiYAWE+2UlEiiIjwQm4jbg6V5z3YB6PWReWRrtM/BMjZAMKwpxFBhjkvffKmj nOVMljNVtNfQ/otxaWXnJcK1ckz18EyRe8ob+qfBc/6NCRpURS1zJJgke8ZK51L7lb49 nVjOwAkfxETzzmp0olErR8gxm46KdqhT1WDwhGo28TSXMJjrdkknoIfMFezJ3xNpvIUQ fVtsOHInymWMjid9ieaK409hxOQx8Kx+m8jgDc7BZ628OrFBjTF8dKxqEvSB36wdv6Um O45c24YqdgBqHIrSYw/gc2PJr9eKm/nrD1SWPSy6ie1fMX3JcVSC0mulqS0aiG7Th2C2 d8mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xCpHSEjh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id hk11-20020a17090b224b00b001e68b44501esi27688713pjb.5.2022.06.07.22.38.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 22:38:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xCpHSEjh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7C4FF38358D; Tue, 7 Jun 2022 22:04:33 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380437AbiFGVm1 (ORCPT + 99 others); Tue, 7 Jun 2022 17:42:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378620AbiFGUwT (ORCPT ); Tue, 7 Jun 2022 16:52:19 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FDCE11AFD0; Tue, 7 Jun 2022 11:42:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9BAA9B82018; Tue, 7 Jun 2022 18:42:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2C02C385A2; Tue, 7 Jun 2022 18:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654627356; bh=s88LYf1pFdDDcHZeXM4fiQIU0i0g0org+rLeRSkBlFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xCpHSEjhM1kTbsGLhCb190zxdXYhP7zBk3JMTccZ+sGcwIluFT5csXr3JuA6hBb8P dW5V/f930dgTmeqx9rlfK8PH7WC63ur2bD7uO454pNbcTXi4ero76vPCM1QndHVU2w jyiaslqEKc2d6Xs6OtOOfbWQzkIjsyvqhdXBjPAQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kant Fan , Lukasz Luba , "Rafael J. Wysocki" Subject: [PATCH 5.17 710/772] thermal: devfreq_cooling: use local ops instead of global ops Date: Tue, 7 Jun 2022 19:05:02 +0200 Message-Id: <20220607165009.968371419@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607164948.980838585@linuxfoundation.org> References: <20220607164948.980838585@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kant Fan commit b947769b8f778db130aad834257fcaca25df2edc upstream. Fix access illegal address problem in following condition: There are multiple devfreq cooling devices in system, some of them has EM model but others do not. Energy model ops such as state2power will append to global devfreq_cooling_ops when the cooling device with EM model is registered. It makes the cooling device without EM model also use devfreq_cooling_ops after appending when registered later by of_devfreq_cooling_register_power() or of_devfreq_cooling_register(). The IPA governor regards the cooling devices without EM model as a power actor, because they also have energy model ops, and will access illegal address at dfc->em_pd when execute cdev->ops->get_requested_power, cdev->ops->state2power or cdev->ops->power2state. Fixes: 615510fe13bd2 ("thermal: devfreq_cooling: remove old power model and use EM") Cc: 5.13+ # 5.13+ Signed-off-by: Kant Fan Reviewed-by: Lukasz Luba Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/thermal/devfreq_cooling.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) --- a/drivers/thermal/devfreq_cooling.c +++ b/drivers/thermal/devfreq_cooling.c @@ -358,21 +358,28 @@ of_devfreq_cooling_register_power(struct struct thermal_cooling_device *cdev; struct device *dev = df->dev.parent; struct devfreq_cooling_device *dfc; + struct thermal_cooling_device_ops *ops; char *name; int err, num_opps; - dfc = kzalloc(sizeof(*dfc), GFP_KERNEL); - if (!dfc) + ops = kmemdup(&devfreq_cooling_ops, sizeof(*ops), GFP_KERNEL); + if (!ops) return ERR_PTR(-ENOMEM); + dfc = kzalloc(sizeof(*dfc), GFP_KERNEL); + if (!dfc) { + err = -ENOMEM; + goto free_ops; + } + dfc->devfreq = df; dfc->em_pd = em_pd_get(dev); if (dfc->em_pd) { - devfreq_cooling_ops.get_requested_power = + ops->get_requested_power = devfreq_cooling_get_requested_power; - devfreq_cooling_ops.state2power = devfreq_cooling_state2power; - devfreq_cooling_ops.power2state = devfreq_cooling_power2state; + ops->state2power = devfreq_cooling_state2power; + ops->power2state = devfreq_cooling_power2state; dfc->power_ops = dfc_power; @@ -407,8 +414,7 @@ of_devfreq_cooling_register_power(struct if (!name) goto remove_qos_req; - cdev = thermal_of_cooling_device_register(np, name, dfc, - &devfreq_cooling_ops); + cdev = thermal_of_cooling_device_register(np, name, dfc, ops); kfree(name); if (IS_ERR(cdev)) { @@ -429,6 +435,8 @@ free_table: kfree(dfc->freq_table); free_dfc: kfree(dfc); +free_ops: + kfree(ops); return ERR_PTR(err); } @@ -510,11 +518,13 @@ EXPORT_SYMBOL_GPL(devfreq_cooling_em_reg void devfreq_cooling_unregister(struct thermal_cooling_device *cdev) { struct devfreq_cooling_device *dfc; + const struct thermal_cooling_device_ops *ops; struct device *dev; if (IS_ERR_OR_NULL(cdev)) return; + ops = cdev->ops; dfc = cdev->devdata; dev = dfc->devfreq->dev.parent; @@ -525,5 +535,6 @@ void devfreq_cooling_unregister(struct t kfree(dfc->freq_table); kfree(dfc); + kfree(ops); } EXPORT_SYMBOL_GPL(devfreq_cooling_unregister);