lkml.org 
[lkml]   [2022]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/core] x86/ibt: Ensure module init/exit points have references
    The following commit has been merged into the x86/core branch of tip:

    Commit-ID: cb9010f87dcbcdbb51cc96b922c6260848cecbd1
    Gitweb: https://git.kernel.org/tip/cb9010f87dcbcdbb51cc96b922c6260848cecbd1
    Author: Peter Zijlstra <peterz@infradead.org>
    AuthorDate: Tue, 08 Mar 2022 16:30:44 +01:00
    Committer: Peter Zijlstra <peterz@infradead.org>
    CommitterDate: Tue, 15 Mar 2022 10:32:42 +01:00

    x86/ibt: Ensure module init/exit points have references

    Since the references to the module init/exit points only have external
    references, a module LTO run will consider them 'unused' and seal
    them, leading to an immediate fail on module load.

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
    Link: https://lore.kernel.org/r/20220308154319.113767246@infradead.org
    ---
    include/linux/cfi.h | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    diff --git a/include/linux/cfi.h b/include/linux/cfi.h
    index 879744a..c6dfc1e 100644
    --- a/include/linux/cfi.h
    +++ b/include/linux/cfi.h
    @@ -34,8 +34,17 @@ static inline void cfi_module_remove(struct module *mod, unsigned long base_addr

    #else /* !CONFIG_CFI_CLANG */

    -#define __CFI_ADDRESSABLE(fn, __attr)
    +#ifdef CONFIG_X86_KERNEL_IBT
    +
    +#define __CFI_ADDRESSABLE(fn, __attr) \
    + const void *__cfi_jt_ ## fn __visible __attr = (void *)&fn
    +
    +#endif /* CONFIG_X86_KERNEL_IBT */

    #endif /* CONFIG_CFI_CLANG */

    +#ifndef __CFI_ADDRESSABLE
    +#define __CFI_ADDRESSABLE(fn, __attr)
    +#endif
    +
    #endif /* _LINUX_CFI_H */
    \
     
     \ /
      Last update: 2022-03-15 11:45    [W:2.044 / U:0.884 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site