lkml.org 
[lkml]   [2018]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 138/140] objtool: Fix another switch table detection issue
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Josh Poimboeuf <jpoimboe@redhat.com>

    commit 1402fd8ed7e5bda1b3e7613b70780b0db392d1e6 upstream.

    Continue the switch table detection whack-a-mole. Add a check to
    distinguish KASAN data reads from switch data reads. The switch jump
    tables in .rodata have relocations associated with them.

    This fixes the following warning:

    crypto/asymmetric_keys/x509_cert_parser.o: warning: objtool: x509_note_pkey_algo()+0xa4: sibling call from callable instruction with modified stack frame

    Reported-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Tested-by: Arnd Bergmann <arnd@arndb.de>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: https://lkml.kernel.org/r/d7c8853022ad47d158cb81e953a40469fc08a95e.1519784382.git.jpoimboe@redhat.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    tools/objtool/check.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/tools/objtool/check.c
    +++ b/tools/objtool/check.c
    @@ -924,7 +924,11 @@ static struct rela *find_switch_table(st
    if (find_symbol_containing(file->rodata, text_rela->addend))
    continue;

    - return find_rela_by_dest(file->rodata, text_rela->addend);
    + rodata_rela = find_rela_by_dest(file->rodata, text_rela->addend);
    + if (!rodata_rela)
    + continue;
    +
    + return rodata_rela;
    }

    return NULL;

    \
     
     \ /
      Last update: 2018-03-13 16:44    [W:4.221 / U:0.792 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site