lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 06/52] x86/speculation, objtool: Annotate indirect calls/jumps for objtool on 32-bit kernels
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Andy Whitcroft <apw@canonical.com>

    commit a14bff131108faf50cc0cf864589fd71ee216c96 upstream.

    In the following commit:

    9e0e3c5130e9 ("x86/speculation, objtool: Annotate indirect calls/jumps for objtool")

    ... we added annotations for CALL_NOSPEC/JMP_NOSPEC on 64-bit x86 kernels,
    but we did not annotate the 32-bit path.

    Annotate it similarly.

    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Arjan van de Ven <arjan@linux.intel.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Dan Williams <dan.j.williams@intel.com>
    Cc: Dave Hansen <dave.hansen@linux.intel.com>
    Cc: David Woodhouse <dwmw2@infradead.org>
    Cc: David Woodhouse <dwmw@amazon.co.uk>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Link: http://lkml.kernel.org/r/20180314112427.22351-1-apw@canonical.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/include/asm/nospec-branch.h | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/arch/x86/include/asm/nospec-branch.h
    +++ b/arch/x86/include/asm/nospec-branch.h
    @@ -183,7 +183,10 @@
    * otherwise we'll run out of registers. We don't care about CET
    * here, anyway.
    */
    -# define CALL_NOSPEC ALTERNATIVE("call *%[thunk_target]\n", \
    +# define CALL_NOSPEC \
    + ALTERNATIVE( \
    + ANNOTATE_RETPOLINE_SAFE \
    + "call *%[thunk_target]\n", \
    " jmp 904f;\n" \
    " .align 16\n" \
    "901: call 903f;\n" \

    \
     
     \ /
      Last update: 2018-03-19 19:46    [W:6.379 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site