Received-SPF: pass (google.com: domain of linux-kernel+bounces-201706-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Feedback-ID: i1719461a:Fastmail
Date: Tue, 04 Jun 2024 20:46:29 -0600
From: Lyndon Sanche <lsanche@lyndeno.ca>
Subject: Re: [PATCH] platform/x86: dell-pc: avoid double free and invalid
 unregistration
To: Thomas =?iso-8859-1?q?Wei=DFschuh?= <linux@weissschuh.net>
Cc: Hans de Goede <hdegoede@redhat.com>, Ilpo =?iso-8859-1?q?J=E4rvinen?=
	<ilpo.jarvinen@linux.intel.com>, platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org
Message-Id: <HD6LES.A9HJVAFECS8L3@lyndeno.ca>
In-Reply-To: <20240604-dell-pc-double-free-v1-1-6d81255b2a44@weissschuh.net>
References: <20240604-dell-pc-double-free-v1-1-6d81255b2a44@weissschuh.net>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1; format=flowed
Content-Transfer-Encoding: quoted-printable


On Tue, Jun 4 2024 at 11:41:24 PM +02:00:00, Thomas Wei=DFschuh=20
<linux@weissschuh.net> wrote:
> If platform_profile_register() fails it does kfree(thermal_handler)=20
> and
> leaves the pointer value around.
> Any call to thermal_cleanup() will try to kfree(thermal_handler)=20
> again.
> This will happen right away in dell_init().
> In addition, platform_profile_remove() will be called although no
> profile is registered.
>=20
> NULL out the thermal_handler, so thermal_cleanup() avoids the double=20
> free.
>=20
> Fixes: 996ad4129810 ("platform/x86: dell-pc: Implement=20
> platform_profile")
> Signed-off-by: Thomas Wei=DFschuh <linux@weissschuh.net>
> ---
> Currently the call to thermal_cleanup() in dell_init() is completely
> unnecessary. But I guess more functionality will be handled by the
> driver and then this structure makes sense.
>=20
> This is untested.
> ---
>  drivers/platform/x86/dell/dell-pc.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>=20
> diff --git a/drivers/platform/x86/dell/dell-pc.c=20
> b/drivers/platform/x86/dell/dell-pc.c
> index dfe09c463d03..972385ca1990 100644
> --- a/drivers/platform/x86/dell/dell-pc.c
> +++ b/drivers/platform/x86/dell/dell-pc.c
> @@ -261,8 +261,10 @@ static int thermal_init(void)
>=20
>  	/* Clean up if failed */
>  	ret =3D platform_profile_register(thermal_handler);
> -	if (ret)
> +	if (ret) {
>  		kfree(thermal_handler);
> +		thermal_handler =3D NULL;
> +	}
>=20
>  	return ret;
>  }
>=20
> ---
> base-commit: 0da7a954480cc99978e3570c991e3779e56fc736
> change-id: 20240604-dell-pc-double-free-e8cf2aa9b2fb
>=20
> Best regards,
> --
> Thomas Wei=DFschuh <linux@weissschuh.net>

Thank you for this patch. I was able to apply your patch and compile=20
successfully. I have not had a chance to try it on my hardware.

I agree with the change, and it looks good to me.

Thanks,

Reviewed-by: Lyndon Sanche <lsanche@lyndeno.ca>