Skip to content

Commit 33158bc

Browse files
committed
[BOLT] Gadget scanner: detect untrusted LR before tail call
Implement the detection of tail calls performed with untrusted link register, which violates the assumption made on entry to every function. Unlike other pauth gadgets, this one involves some amount of guessing which branch instructions should be checked as tail calls.
1 parent e5fdebd commit 33158bc

File tree

4 files changed

+730
-40
lines changed

4 files changed

+730
-40
lines changed

bolt/lib/Passes/PAuthGadgetScanner.cpp

+109-3
Original file line numberDiff line numberDiff line change
@@ -660,8 +660,9 @@ class DataflowSrcSafetyAnalysis
660660
//
661661
// Then, a function can be split into a number of disjoint contiguous sequences
662662
// of instructions without labels in between. These sequences can be processed
663-
// the same way basic blocks are processed by data-flow analysis, assuming
664-
// pessimistically that all registers are unsafe at the start of each sequence.
663+
// the same way basic blocks are processed by data-flow analysis, with the same
664+
// pessimistic estimation of the initial state at the start of each sequence
665+
// (except the first instruction of the function).
665666
class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis {
666667
BinaryFunction &BF;
667668
MCPlusBuilder::AllocatorIdTy AllocId;
@@ -672,6 +673,30 @@ class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis {
672673
BC.MIB->removeAnnotation(I.second, StateAnnotationIndex);
673674
}
674675

676+
/// Compute a reasonably pessimistic estimation of the register state when
677+
/// the previous instruction is not known for sure. Take the set of registers
678+
/// which are trusted at function entry and remove all registers that can be
679+
/// clobbered inside this function.
680+
SrcState computePessimisticState(BinaryFunction &BF) {
681+
BitVector ClobberedRegs(NumRegs);
682+
for (auto &I : BF.instrs()) {
683+
MCInst &Inst = I.second;
684+
BC.MIB->getClobberedRegs(Inst, ClobberedRegs);
685+
686+
// If this is a call instruction, no register is safe anymore, unless
687+
// it is a tail call. Ignore tail calls for the purpose of estimating the
688+
// worst-case scenario, assuming no instructions are executed in the
689+
// caller after this point anyway.
690+
if (BC.MIB->isCall(Inst) && !BC.MIB->isTailCall(Inst))
691+
ClobberedRegs.set();
692+
}
693+
694+
SrcState S = createEntryState();
695+
S.SafeToDerefRegs.reset(ClobberedRegs);
696+
S.TrustedRegs.reset(ClobberedRegs);
697+
return S;
698+
}
699+
675700
public:
676701
CFGUnawareSrcSafetyAnalysis(BinaryFunction &BF,
677702
MCPlusBuilder::AllocatorIdTy AllocId,
@@ -682,6 +707,7 @@ class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis {
682707
}
683708

684709
void run() override {
710+
const SrcState DefaultState = computePessimisticState(BF);
685711
SrcState S = createEntryState();
686712
for (auto &I : BF.instrs()) {
687713
MCInst &Inst = I.second;
@@ -696,7 +722,7 @@ class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis {
696722
LLVM_DEBUG({
697723
traceInst(BC, "Due to label, resetting the state before", Inst);
698724
});
699-
S = createUnsafeState();
725+
S = DefaultState;
700726
}
701727

702728
// Check if we need to remove an old annotation (this is the case if
@@ -1233,6 +1259,83 @@ shouldReportReturnGadget(const BinaryContext &BC, const MCInstReference &Inst,
12331259
return make_gadget_report(RetKind, Inst, *RetReg);
12341260
}
12351261

1262+
/// While BOLT already marks some of the branch instructions as tail calls,
1263+
/// this function tries to improve the coverage by including less obvious cases
1264+
/// when it is possible to do without introducing too many false positives.
1265+
static bool shouldAnalyzeTailCallInst(const BinaryContext &BC,
1266+
const BinaryFunction &BF,
1267+
const MCInstReference &Inst) {
1268+
// Some BC.MIB->isXYZ(Inst) methods simply delegate to MCInstrDesc::isXYZ()
1269+
// (such as isBranch at the time of writing this comment), some don't (such
1270+
// as isCall). For that reason, call MCInstrDesc's methods explicitly when
1271+
// it is important.
1272+
const MCInstrDesc &Desc =
1273+
BC.MII->get(static_cast<const MCInst &>(Inst).getOpcode());
1274+
// Tail call should be a branch (but not necessarily an indirect one).
1275+
if (!Desc.isBranch())
1276+
return false;
1277+
1278+
// Always analyze the branches already marked as tail calls by BOLT.
1279+
if (BC.MIB->isTailCall(Inst))
1280+
return true;
1281+
1282+
// Try to also check the branches marked as "UNKNOWN CONTROL FLOW" - the
1283+
// below is a simplified condition from BinaryContext::printInstruction.
1284+
bool IsUnknownControlFlow =
1285+
BC.MIB->isIndirectBranch(Inst) && !BC.MIB->getJumpTable(Inst);
1286+
1287+
if (BF.hasCFG() && IsUnknownControlFlow)
1288+
return true;
1289+
1290+
return false;
1291+
}
1292+
1293+
static std::optional<PartialReport<MCPhysReg>>
1294+
shouldReportUnsafeTailCall(const BinaryContext &BC, const BinaryFunction &BF,
1295+
const MCInstReference &Inst, const SrcState &S) {
1296+
static const GadgetKind UntrustedLRKind(
1297+
"untrusted link register found before tail call");
1298+
1299+
if (!shouldAnalyzeTailCallInst(BC, BF, Inst))
1300+
return std::nullopt;
1301+
1302+
// Not only the set of registers returned by getTrustedLiveInRegs() can be
1303+
// seen as a reasonable target-independent _approximation_ of "the LR", these
1304+
// are *exactly* those registers used by SrcSafetyAnalysis to initialize the
1305+
// set of trusted registers on function entry.
1306+
// Thus, this function basically checks that the precondition expected to be
1307+
// imposed by a function call instruction (which is hardcoded into the target-
1308+
// specific getTrustedLiveInRegs() function) is also respected on tail calls.
1309+
SmallVector<MCPhysReg> RegsToCheck = BC.MIB->getTrustedLiveInRegs();
1310+
LLVM_DEBUG({
1311+
traceInst(BC, "Found tail call inst", Inst);
1312+
traceRegMask(BC, "Trusted regs", S.TrustedRegs);
1313+
});
1314+
1315+
// In musl on AArch64, the _start function sets LR to zero and calls the next
1316+
// stage initialization function at the end, something along these lines:
1317+
//
1318+
// _start:
1319+
// mov x30, #0
1320+
// ; ... other initialization ...
1321+
// b _start_c ; performs "exit" system call at some point
1322+
//
1323+
// As this would produce a false positive for every executable linked with
1324+
// such libc, ignore tail calls performed by ELF entry function.
1325+
if (BC.StartFunctionAddress &&
1326+
*BC.StartFunctionAddress == Inst.getFunction()->getAddress()) {
1327+
LLVM_DEBUG({ dbgs() << " Skipping tail call in ELF entry function.\n"; });
1328+
return std::nullopt;
1329+
}
1330+
1331+
// Returns at most one report per instruction - this is probably OK...
1332+
for (auto Reg : RegsToCheck)
1333+
if (!S.TrustedRegs[Reg])
1334+
return make_gadget_report(UntrustedLRKind, Inst, Reg);
1335+
1336+
return std::nullopt;
1337+
}
1338+
12361339
static std::optional<PartialReport<MCPhysReg>>
12371340
shouldReportCallGadget(const BinaryContext &BC, const MCInstReference &Inst,
12381341
const SrcState &S) {
@@ -1400,6 +1503,9 @@ void FunctionAnalysisContext::findUnsafeUses(
14001503
if (PacRetGadgetsOnly)
14011504
return;
14021505

1506+
if (auto Report = shouldReportUnsafeTailCall(BC, BF, Inst, S))
1507+
Reports.push_back(*Report);
1508+
14031509
if (auto Report = shouldReportCallGadget(BC, Inst, S))
14041510
Reports.push_back(*Report);
14051511
if (auto Report = shouldReportSigningOracle(BC, Inst, S))

bolt/test/binary-analysis/AArch64/gs-pacret-autiasp.s

+22-9
Original file line numberDiff line numberDiff line change
@@ -229,20 +229,33 @@ f_unreachable_instruction:
229229
ret
230230
.size f_unreachable_instruction, .-f_unreachable_instruction
231231

232-
// Expected false positive: without CFG, the state is reset to all-unsafe
233-
// after an unconditional branch.
234-
235-
.globl state_is_reset_after_indirect_branch_nocfg
236-
.type state_is_reset_after_indirect_branch_nocfg,@function
237-
state_is_reset_after_indirect_branch_nocfg:
238-
// CHECK-LABEL: GS-PAUTH: non-protected ret found in function state_is_reset_after_indirect_branch_nocfg, at address
239-
// CHECK-NEXT: The instruction is {{[0-9a-f]+}}: ret
232+
// Without CFG, the state is reset at labels, assuming every register that can
233+
// be clobbered in the function was actually clobbered.
234+
235+
.globl lr_untouched_nocfg
236+
.type lr_untouched_nocfg,@function
237+
lr_untouched_nocfg:
238+
// CHECK-NOT: lr_untouched_nocfg
239+
adr x2, 1f
240+
br x2
241+
1:
242+
ret
243+
.size lr_untouched_nocfg, .-lr_untouched_nocfg
244+
245+
.globl lr_clobbered_nocfg
246+
.type lr_clobbered_nocfg,@function
247+
lr_clobbered_nocfg:
248+
// CHECK-LABEL: GS-PAUTH: non-protected ret found in function lr_clobbered_nocfg, at address
249+
// CHECK-NEXT: The instruction is {{[0-9a-f]+}}: ret
240250
// CHECK-NEXT: The 0 instructions that write to the affected registers after any authentication are:
241251
adr x2, 1f
242252
br x2
243253
1:
254+
b 2f
255+
bl g // never executed, but affects the expected worst-case scenario
256+
2:
244257
ret
245-
.size state_is_reset_after_indirect_branch_nocfg, .-state_is_reset_after_indirect_branch_nocfg
258+
.size lr_clobbered_nocfg, .-lr_clobbered_nocfg
246259

247260
/// Now do a basic sanity check on every different Authentication instruction:
248261

bolt/test/binary-analysis/AArch64/gs-pauth-debug-output.s

+2-28
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ nocfg:
199199
// CHECK-NEXT: SrcSafetyAnalysis::ComputeNext( br x0, src-state<SafeToDerefRegs: LR W0 W30 X0 W0_HI W30_HI , TrustedRegs: LR W0 W30 X0 W0_HI W30_HI , Insts: >)
200200
// CHECK-NEXT: .. result: (src-state<SafeToDerefRegs: LR W0 W30 X0 W0_HI W30_HI , TrustedRegs: LR W0 W30 X0 W0_HI W30_HI , Insts: >)
201201
// CHECK-NEXT: Due to label, resetting the state before: 00000000: ret # Offset: 8
202-
// CHECK-NEXT: SrcSafetyAnalysis::ComputeNext( ret x30, src-state<SafeToDerefRegs: , TrustedRegs: , Insts: >)
203-
// CHECK-NEXT: .. result: (src-state<SafeToDerefRegs: , TrustedRegs: , Insts: >)
202+
// CHECK-NEXT: SrcSafetyAnalysis::ComputeNext( ret x30, src-state<SafeToDerefRegs: LR W30 W30_HI , TrustedRegs: LR W30 W30_HI , Insts: >)
203+
// CHECK-NEXT: .. result: (src-state<SafeToDerefRegs: LR W30 W30_HI , TrustedRegs: LR W30 W30_HI , Insts: >)
204204
// CHECK-NEXT: After src register safety analysis:
205205
// CHECK-NEXT: Binary Function "nocfg" {
206206
// CHECK-NEXT: Number : 3
@@ -224,32 +224,6 @@ nocfg:
224224
// CHECK-NEXT: Found RET inst: 00000000: ret # Offset: 8 # CFGUnawareSrcSafetyAnalysis: src-state<SafeToDerefRegs: BitVector, TrustedRegs: BitVector, Insts: >
225225
// CHECK-NEXT: RetReg: LR
226226
// CHECK-NEXT: SafeToDerefRegs:
227-
// CHECK-EMPTY:
228-
// CHECK-NEXT: Running detailed src register safety analysis...
229-
// CHECK-NEXT: SrcSafetyAnalysis::ComputeNext( adr x0, __ENTRY_nocfg@0x[[ENTRY_ADDR]], src-state<SafeToDerefRegs: LR W30 W30_HI , TrustedRegs: LR W30 W30_HI , Insts: [0]()>)
230-
// CHECK-NEXT: .. result: (src-state<SafeToDerefRegs: LR W0 W30 X0 W0_HI W30_HI , TrustedRegs: LR W0 W30 X0 W0_HI W30_HI , Insts: [0]()>)
231-
// CHECK-NEXT: SrcSafetyAnalysis::ComputeNext( br x0, src-state<SafeToDerefRegs: LR W0 W30 X0 W0_HI W30_HI , TrustedRegs: LR W0 W30 X0 W0_HI W30_HI , Insts: [0]()>)
232-
// CHECK-NEXT: .. result: (src-state<SafeToDerefRegs: LR W0 W30 X0 W0_HI W30_HI , TrustedRegs: LR W0 W30 X0 W0_HI W30_HI , Insts: [0]()>)
233-
// CHECK-NEXT: Due to label, resetting the state before: 00000000: ret # Offset: 8
234-
// CHECK-NEXT: SrcSafetyAnalysis::ComputeNext( ret x30, src-state<SafeToDerefRegs: , TrustedRegs: , Insts: [0]()>)
235-
// CHECK-NEXT: .. result: (src-state<SafeToDerefRegs: , TrustedRegs: , Insts: [0]()>)
236-
// CHECK-NEXT: After detailed src register safety analysis:
237-
// CHECK-NEXT: Binary Function "nocfg" {
238-
// CHECK-NEXT: Number : 3
239-
// ...
240-
// CHECK: Secondary Entry Points : __ENTRY_nocfg@0x[[ENTRY_ADDR]]
241-
// CHECK-NEXT: }
242-
// CHECK-NEXT: .{{[A-Za-z0-9]+}}:
243-
// CHECK-NEXT: 00000000: adr x0, __ENTRY_nocfg@0x[[ENTRY_ADDR]] # CFGUnawareSrcSafetyAnalysis: src-state<SafeToDerefRegs: BitVector, TrustedRegs: BitVector, Insts: [0]()>
244-
// CHECK-NEXT: 00000004: br x0 # UNKNOWN CONTROL FLOW # Offset: 4 # CFGUnawareSrcSafetyAnalysis: src-state<SafeToDerefRegs: BitVector, TrustedRegs: BitVector, Insts: [0]()>
245-
// CHECK-NEXT: __ENTRY_nocfg@0x[[ENTRY_ADDR]] (Entry Point):
246-
// CHECK-NEXT: .{{[A-Za-z0-9]+}}:
247-
// CHECK-NEXT: 00000008: ret # Offset: 8 # CFGUnawareSrcSafetyAnalysis: src-state<SafeToDerefRegs: BitVector, TrustedRegs: BitVector, Insts: [0]()>
248-
// CHECK-NEXT: DWARF CFI Instructions:
249-
// CHECK-NEXT: <empty>
250-
// CHECK-NEXT: End of Function "nocfg"
251-
// CHECK-EMPTY:
252-
// CHECK-NEXT: Attaching clobbering info to: 00000000: ret # Offset: 8 # CFGUnawareSrcSafetyAnalysis: src-state<SafeToDerefRegs: BitVector, TrustedRegs: BitVector, Insts: [0]()>
253227

254228
.globl auth_oracle
255229
.type auth_oracle,@function

0 commit comments

Comments
 (0)