diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-14 21:15:55 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-14 21:15:55 +0100 |
| commit | 19469d2adab9a94e3c1713b7a12a67f9c59c1161 (patch) | |
| tree | e8f1a849287972cd67eaec14410be41d5f3f50ae /tools | |
| parent | Merge tag 'locking-urgent-2021-03-14' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | objtool,x86: Fix uaccess PUSHF/POPF validation (diff) | |
| download | linux-19469d2adab9a94e3c1713b7a12a67f9c59c1161.tar.xz linux-19469d2adab9a94e3c1713b7a12a67f9c59c1161.zip | |
Merge tag 'objtool-urgent-2021-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fix from Thomas Gleixner:
"A single objtool fix to handle the PUSHF/POPF validation correctly for
the paravirt changes which modified arch_local_irq_restore not to use
popf"
* tag 'objtool-urgent-2021-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool,x86: Fix uaccess PUSHF/POPF validation
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/objtool/check.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 068cdb41f76f..5e5388a38e2a 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -2442,6 +2442,9 @@ static int handle_insn_ops(struct instruction *insn, struct insn_state *state) if (update_cfi_state(insn, &state->cfi, op)) return 1; + if (!insn->alt_group) + continue; + if (op->dest.type == OP_DEST_PUSHF) { if (!state->uaccess_stack) { state->uaccess_stack = 1; |