4.14-stable review patch.  If anyone has any objections, please let me know.


From: Josh Poimboeuf <jpoim...@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 <a...@arndb.de>
Signed-off-by: Josh Poimboeuf <jpoim...@redhat.com>
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Tested-by: Arnd Bergmann <a...@arndb.de>
Cc: Peter Zijlstra <pet...@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gre...@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))
-               return find_rela_by_dest(file->rodata, text_rela->addend);
+               rodata_rela = find_rela_by_dest(file->rodata, 
+               if (!rodata_rela)
+                       continue;
+               return rodata_rela;
        return NULL;

Reply via email to