]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
platform/x86: thinkpad_acpi: Handle KCOV __init vs inline mismatches
authorKees Cook <kees@kernel.org>
Thu, 29 May 2025 18:18:37 +0000 (11:18 -0700)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Fri, 13 Jun 2025 09:33:01 +0000 (12:33 +0300)
When KCOV is enabled all functions get instrumented, unless the
__no_sanitize_coverage attribute is used. To prepare for
__no_sanitize_coverage being applied to __init functions[1], we have
to handle differences in how GCC's inline optimizations get resolved.
For thinkpad_acpi routines, this means forcing two functions to be
inline with __always_inline.

Link: https://lore.kernel.org/lkml/20250523043935.2009972-11-kees@kernel.org/
Signed-off-by: Kees Cook <kees@kernel.org>
Link: https://lore.kernel.org/r/20250529181831.work.439-kees@kernel.org
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/lenovo/thinkpad_acpi.c

index e1c7bd06fa12ff96b2c1fa2b82b199a168512d49..d5bfaa3d0de59e9cf306e896ac76d140a3b3f344 100644 (file)
@@ -559,12 +559,12 @@ static unsigned long __init tpacpi_check_quirks(
        return 0;
 }
 
-static inline bool __pure __init tpacpi_is_lenovo(void)
+static __always_inline bool __pure __init tpacpi_is_lenovo(void)
 {
        return thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO;
 }
 
-static inline bool __pure __init tpacpi_is_ibm(void)
+static __always_inline bool __pure __init tpacpi_is_ibm(void)
 {
        return thinkpad_id.vendor == PCI_VENDOR_ID_IBM;
 }