• Brendan Higgins's avatar
    lkdtm/bugs: fix build error in lkdtm_UNSET_SMEP · 0e31e357
    Brendan Higgins authored
    When building ARCH=um with CONFIG_UML_X86=y and CONFIG_64BIT=y we get
    the build errors:
    
    drivers/misc/lkdtm/bugs.c: In function ‘lkdtm_UNSET_SMEP’:
    drivers/misc/lkdtm/bugs.c:288:8: error: implicit declaration of function ‘native_read_cr4’ [-Werror=implicit-function-declaration]
      cr4 = native_read_cr4();
            ^~~~~~~~~~~~~~~
    drivers/misc/lkdtm/bugs.c:290:13: error: ‘X86_CR4_SMEP’ undeclared (first use in this function); did you mean ‘X86_FEATURE_SMEP’?
      if ((cr4 & X86_CR4_SMEP) != X86_CR4_SMEP) {
                 ^~~~~~~~~~~~
                 X86_FEATURE_SMEP
    drivers/misc/lkdtm/bugs.c:290:13: note: each undeclared identifier is reported only once for each function it appears in
    drivers/misc/lkdtm/bugs.c:297:2: error: implicit declaration of function ‘native_write_cr4’; did you mean ‘direct_write_cr4’? [-Werror=implicit-function-declaration]
      native_write_cr4(cr4);
      ^~~~~~~~~~~~~~~~
      direct_write_cr4
    
    So specify that this block of code should only build when
    CONFIG_X86_64=y *AND* CONFIG_UML is unset.
    Signed-off-by: default avatarBrendan Higgins <brendanhiggins@google.com>
    Acked-by: default avatarKees Cook <keescook@chromium.org>
    Link: https://lore.kernel.org/r/20191213003522.66450-1-brendanhiggins@google.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
    0e31e357
bugs.c 9.11 KB