lkml.org 
[lkml]   [2021]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v5 07/15] lkdtm: Disable UNSET_SMEP with CFI
    From
    Disable the UNSET_SMEP test when CONFIG_CFI_CLANG is enabled as
    jumping to a call gadget would always trip CFI instead.

    Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
    Acked-by: Kees Cook <keescook@chromium.org>
    Tested-by: Nick Desaulniers <ndesaulniers@google.com>
    Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
    ---
    drivers/misc/lkdtm/bugs.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c
    index 4282b625200f..6e8677852262 100644
    --- a/drivers/misc/lkdtm/bugs.c
    +++ b/drivers/misc/lkdtm/bugs.c
    @@ -367,7 +367,7 @@ void lkdtm_STACK_GUARD_PAGE_TRAILING(void)

    void lkdtm_UNSET_SMEP(void)
    {
    -#if IS_ENABLED(CONFIG_X86_64) && !IS_ENABLED(CONFIG_UML)
    +#if IS_ENABLED(CONFIG_X86_64) && !IS_ENABLED(CONFIG_UML) && !IS_ENABLED(CONFIG_CFI_CLANG)
    #define MOV_CR4_DEPTH 64
    void (*direct_write_cr4)(unsigned long val);
    unsigned char *insn;
    --
    2.33.0.1079.g6e70778dc9-goog
    \
     
     \ /
      Last update: 2021-10-13 20:18    [W:4.199 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site