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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull objtool fix from Thomas Gleixner:
"A single robustness fix for objtool to handle unbalanced CLAC
invocations under all circumstances"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Improve UACCESS coverage

Linus Torvalds 13fbe991 88c50834

+6 -4
+4 -3
tools/objtool/check.c
··· 1946 1946 struct alternative *alt; 1947 1947 struct instruction *insn, *next_insn; 1948 1948 struct section *sec; 1949 + u8 visited; 1949 1950 int ret; 1950 1951 1951 1952 insn = first; ··· 1973 1972 return 1; 1974 1973 } 1975 1974 1975 + visited = 1 << state.uaccess; 1976 1976 if (insn->visited) { 1977 1977 if (!insn->hint && !insn_state_match(insn, &state)) 1978 1978 return 1; 1979 1979 1980 - /* If we were here with AC=0, but now have AC=1, go again */ 1981 - if (insn->state.uaccess || !state.uaccess) 1980 + if (insn->visited & visited) 1982 1981 return 0; 1983 1982 } 1984 1983 ··· 2025 2024 } else 2026 2025 insn->state = state; 2027 2026 2028 - insn->visited = true; 2027 + insn->visited |= visited; 2029 2028 2030 2029 if (!insn->ignore_alts) { 2031 2030 bool skip_orig = false;
+2 -1
tools/objtool/check.h
··· 33 33 unsigned int len; 34 34 enum insn_type type; 35 35 unsigned long immediate; 36 - bool alt_group, visited, dead_end, ignore, hint, save, restore, ignore_alts; 36 + bool alt_group, dead_end, ignore, hint, save, restore, ignore_alts; 37 37 bool retpoline_safe; 38 + u8 visited; 38 39 struct symbol *call_dest; 39 40 struct instruction *jump_dest; 40 41 struct instruction *first_jump_src;