Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

objtool: Fix pv_ops noinstr validation

Boris reported that in one of his randconfig builds, objtool got
infinitely stuck. Turns out there's trivial list corruption in the
pv_ops tracking when a function is both in a static table and in a code
assignment.

Avoid re-adding function to the pv_ops[] lists when they're already on
it.

Fixes: db2b0c5d7b6f ("objtool: Support pv_opsindirect calls for noinstr")
Reported-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Tested-by: Borislav Petkov <bp@alien8.de>
Link: https://lkml.kernel.org/r/20211202204534.GA16608@worktop.programming.kicks-ass.net

authored by

Peter Zijlstra and committed by
Borislav Petkov
988f0168 b50db709

+5
+1
tools/objtool/elf.c
··· 375 375 return -1; 376 376 } 377 377 memset(sym, 0, sizeof(*sym)); 378 + INIT_LIST_HEAD(&sym->pv_target); 378 379 sym->alias = sym; 379 380 380 381 sym->idx = i;
+4
tools/objtool/objtool.c
··· 153 153 !strcmp(func->name, "_paravirt_ident_64")) 154 154 return; 155 155 156 + /* already added this function */ 157 + if (!list_empty(&func->pv_target)) 158 + return; 159 + 156 160 list_add(&func->pv_target, &f->pv_ops[idx].targets); 157 161 f->pv_ops[idx].clean = false; 158 162 }