From: Thomas Weißschuh Date: Tue, 4 Jun 2024 21:41:24 +0000 (+0200) Subject: platform/x86: dell-pc: avoid double free and invalid unregistration X-Git-Tag: v6.11-rc1~150^2~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd637f5cd5f334d2d014872544470031415cec3b;p=thirdparty%2Fkernel%2Flinux.git platform/x86: dell-pc: avoid double free and invalid unregistration If platform_profile_register() fails it does kfree(thermal_handler) and leaves the pointer value around. Any call to thermal_cleanup() will try to kfree(thermal_handler) again. This will happen right away in dell_init(). In addition, platform_profile_remove() will be called although no profile is registered. NULL out the thermal_handler, so thermal_cleanup() avoids the double free. Fixes: 996ad4129810 ("platform/x86: dell-pc: Implement platform_profile") Signed-off-by: Thomas Weißschuh Reviewed-by: Lyndon Sanche Link: https://lore.kernel.org/r/20240604-dell-pc-double-free-v1-1-6d81255b2a44@weissschuh.net Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen --- diff --git a/drivers/platform/x86/dell/dell-pc.c b/drivers/platform/x86/dell/dell-pc.c index dfe09c463d03e..972385ca1990b 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) /* Clean up if failed */ ret = platform_profile_register(thermal_handler); - if (ret) + if (ret) { kfree(thermal_handler); + thermal_handler = NULL; + } return ret; }