lkdtm: Avoid objtool/ibt warning
authorPeter Zijlstra <peterz@infradead.org>
Mon, 14 Nov 2022 15:23:45 +0000 (16:23 +0100)
committerJosh Poimboeuf <jpoimboe@kernel.org>
Wed, 7 Jun 2023 16:27:11 +0000 (09:27 -0700)
For certain configs objtool will complain like:

  vmlinux.o: warning: objtool: lkdtm_UNSET_SMEP+0x1c3: relocation to !ENDBR: native_write_cr4+0x41

What happens is that GCC optimizes the loop:

        insn = (unsigned char *)native_write_cr4;
        for (i = 0; i < MOV_CR4_DEPTH; i++)

to read something like:

        for (insn = (unsigned char *)native_write_cr4;
             insn < (unsigned char *)native_write_cr4 + MOV_CR4_DEPTH;
             insn++)

Which then obviously generates the text reference
native_write_cr4+041. Since none of this is a fast path, simply
confuse GCC enough to inhibit this optimization.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/Y3JdgbXRV0MNZ+9h@hirez.programming.kicks-ass.net
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
drivers/misc/lkdtm/bugs.c

index 48821f4..92110cb 100644 (file)
@@ -487,6 +487,7 @@ static void lkdtm_UNSET_SMEP(void)
         * the cr4 writing instruction.
         */
        insn = (unsigned char *)native_write_cr4;
+       OPTIMIZER_HIDE_VAR(insn);
        for (i = 0; i < MOV_CR4_DEPTH; i++) {
                /* mov %rdi, %cr4 */
                if (insn[i] == 0x0f && insn[i+1] == 0x22 && insn[i+2] == 0xe7)