linux-kernel - Re: [PATCH] int340X/processor_thermal_device: Fix proc_thermal_rapl

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <1563867173.2455.50.camel@intel.com>
Date:   Tue, 23 Jul 2019 15:32:53 +0800
From:   Zhang Rui <rui.zhang@...el.com>
To:     "Rafael J. Wysocki" <rafael@...nel.org>,
        Linux PM <linux-pm@...r.kernel.org>
Cc:     Srinivas Pandruvada <srinivas.pandruvada@...ux.intel.com>,
        Linux ACPI <linux-acpi@...r.kernel.org>,
        LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] int340X/processor_thermal_device: Fix
 proc_thermal_rapl_remove()

On 二, 2019-07-23 at 09:30 +0200, Rafael J. Wysocki wrote:
> On Mon, Jul 22, 2019 at 12:23 PM Rafael J. Wysocki <rjw@...ysocki.net
> > wrote:
> > 
> > 
> > From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
> > 
> > Passing 0 to cpuhp_remove_state() triggers the BUG_ON() in
> > __cpuhp_remove_state_cpuslocked() and the argument passed to
> > powercap_unregister_control_type() is expected to be a valid
> > pointer, so avoid calling these functions with incorrect
> > arguments from proc_thermal_rapl_remove().
> > 
> > Fixes: 555c45fe0d04 ("int340X/processor_thermal_device: add support
> > for MMIO RAPL")
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Acked-by: Zhang Rui <rui.zhang@...el.com>

> Any comments?
> 
> If not, I'll queue this up along with the other RAPL-related fix
> (https://patchwork.kernel.org/patch/11050999/).
> 
> > 
> > ---
> >  drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> > |    4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > Index: linux-
> > pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> > ===================================================================
> > --- linux-
> > pm.orig/drivers/thermal/intel/int340x_thermal/processor_thermal_dev
> > ice.c
> > +++ linux-
> > pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> > @@ -487,6 +487,7 @@ static int proc_thermal_rapl_add(struct
> >                                 rapl_mmio_cpu_online,
> > rapl_mmio_cpu_down_prep);
> >         if (ret < 0) {
> >                 powercap_unregister_control_type(rapl_mmio_priv.con
> > trol_type);
> > +               rapl_mmio_priv.control_type = NULL;
> >                 return ret;
> >         }
> >         rapl_mmio_priv.pcap_rapl_online = ret;
> > @@ -496,6 +497,9 @@ static int proc_thermal_rapl_add(struct
> > 
> >  static void proc_thermal_rapl_remove(void)
> >  {
> > +       if (IS_ERR_OR_NULL(rapl_mmio_priv.control_type))
> > +               return;
> > +
> >         cpuhp_remove_state(rapl_mmio_priv.pcap_rapl_online);
> >         powercap_unregister_control_type(rapl_mmio_priv.control_typ
> > e);
> >  }
> > 
> > 
> >