Skip to content

Commit 5a68042

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 6ca76c6 commit 5a68042

File tree

4 files changed

+706
-46
lines changed

4 files changed

+706
-46
lines changed

bolt/lib/Passes/PAuthGadgetScanner.cpp

Lines changed: 85 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -737,19 +737,14 @@ template <typename StateTy> class CFGUnawareAnalysis {
737737
//
738738
// Then, a function can be split into a number of disjoint contiguous sequences
739739
// of instructions without labels in between. These sequences can be processed
740-
// the same way basic blocks are processed by data-flow analysis, assuming
741-
// pessimistically that all registers are unsafe at the start of each sequence.
740+
// the same way basic blocks are processed by data-flow analysis, with the same
741+
// pessimistic estimation of the initial state at the start of each sequence
742+
// (except the first instruction of the function).
742743
class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis,
743744
public CFGUnawareAnalysis<SrcState> {
744745
using SrcSafetyAnalysis::BC;
745746
BinaryFunction &BF;
746747

747-
/// Creates a state with all registers marked unsafe (not to be confused
748-
/// with empty state).
749-
SrcState createUnsafeState() const {
750-
return SrcState(NumRegs, RegsToTrackInstsFor.getNumTrackedRegisters());
751-
}
752-
753748
public:
754749
CFGUnawareSrcSafetyAnalysis(BinaryFunction &BF,
755750
MCPlusBuilder::AllocatorIdTy AllocId,
@@ -759,6 +754,7 @@ class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis,
759754
}
760755

761756
void run() override {
757+
const SrcState DefaultState = computePessimisticState(BF);
762758
SrcState S = createEntryState();
763759
for (auto &I : BF.instrs()) {
764760
MCInst &Inst = I.second;
@@ -773,7 +769,7 @@ class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis,
773769
LLVM_DEBUG({
774770
traceInst(BC, "Due to label, resetting the state before", Inst);
775771
});
776-
S = createUnsafeState();
772+
S = DefaultState;
777773
}
778774

779775
// Attach the state *before* this instruction executes.
@@ -1311,6 +1307,83 @@ shouldReportReturnGadget(const BinaryContext &BC, const MCInstReference &Inst,
13111307
return make_gadget_report(RetKind, Inst, *RetReg);
13121308
}
13131309

1310+
/// While BOLT already marks some of the branch instructions as tail calls,
1311+
/// this function tries to improve the coverage by including less obvious cases
1312+
/// when it is possible to do without introducing too many false positives.
1313+
static bool shouldAnalyzeTailCallInst(const BinaryContext &BC,
1314+
const BinaryFunction &BF,
1315+
const MCInstReference &Inst) {
1316+
// Some BC.MIB->isXYZ(Inst) methods simply delegate to MCInstrDesc::isXYZ()
1317+
// (such as isBranch at the time of writing this comment), some don't (such
1318+
// as isCall). For that reason, call MCInstrDesc's methods explicitly when
1319+
// it is important.
1320+
const MCInstrDesc &Desc =
1321+
BC.MII->get(static_cast<const MCInst &>(Inst).getOpcode());
1322+
// Tail call should be a branch (but not necessarily an indirect one).
1323+
if (!Desc.isBranch())
1324+
return false;
1325+
1326+
// Always analyze the branches already marked as tail calls by BOLT.
1327+
if (BC.MIB->isTailCall(Inst))
1328+
return true;
1329+
1330+
// Try to also check the branches marked as "UNKNOWN CONTROL FLOW" - the
1331+
// below is a simplified condition from BinaryContext::printInstruction.
1332+
bool IsUnknownControlFlow =
1333+
BC.MIB->isIndirectBranch(Inst) && !BC.MIB->getJumpTable(Inst);
1334+
1335+
if (BF.hasCFG() && IsUnknownControlFlow)
1336+
return true;
1337+
1338+
return false;
1339+
}
1340+
1341+
static std::optional<PartialReport<MCPhysReg>>
1342+
shouldReportUnsafeTailCall(const BinaryContext &BC, const BinaryFunction &BF,
1343+
const MCInstReference &Inst, const SrcState &S) {
1344+
static const GadgetKind UntrustedLRKind(
1345+
"untrusted link register found before tail call");
1346+
1347+
if (!shouldAnalyzeTailCallInst(BC, BF, Inst))
1348+
return std::nullopt;
1349+
1350+
// Not only the set of registers returned by getTrustedLiveInRegs() can be
1351+
// seen as a reasonable target-independent _approximation_ of "the LR", these
1352+
// are *exactly* those registers used by SrcSafetyAnalysis to initialize the
1353+
// set of trusted registers on function entry.
1354+
// Thus, this function basically checks that the precondition expected to be
1355+
// imposed by a function call instruction (which is hardcoded into the target-
1356+
// specific getTrustedLiveInRegs() function) is also respected on tail calls.
1357+
SmallVector<MCPhysReg> RegsToCheck = BC.MIB->getTrustedLiveInRegs();
1358+
LLVM_DEBUG({
1359+
traceInst(BC, "Found tail call inst", Inst);
1360+
traceRegMask(BC, "Trusted regs", S.TrustedRegs);
1361+
});
1362+
1363+
// In musl on AArch64, the _start function sets LR to zero and calls the next
1364+
// stage initialization function at the end, something along these lines:
1365+
//
1366+
// _start:
1367+
// mov x30, #0
1368+
// ; ... other initialization ...
1369+
// b _start_c ; performs "exit" system call at some point
1370+
//
1371+
// As this would produce a false positive for every executable linked with
1372+
// such libc, ignore tail calls performed by ELF entry function.
1373+
if (BC.StartFunctionAddress &&
1374+
*BC.StartFunctionAddress == Inst.getFunction()->getAddress()) {
1375+
LLVM_DEBUG({ dbgs() << " Skipping tail call in ELF entry function.\n"; });
1376+
return std::nullopt;
1377+
}
1378+
1379+
// Returns at most one report per instruction - this is probably OK...
1380+
for (auto Reg : RegsToCheck)
1381+
if (!S.TrustedRegs[Reg])
1382+
return make_gadget_report(UntrustedLRKind, Inst, Reg);
1383+
1384+
return std::nullopt;
1385+
}
1386+
13141387
static std::optional<PartialReport<MCPhysReg>>
13151388
shouldReportCallGadget(const BinaryContext &BC, const MCInstReference &Inst,
13161389
const SrcState &S) {
@@ -1466,6 +1539,9 @@ void FunctionAnalysisContext::findUnsafeUses(
14661539
if (PacRetGadgetsOnly)
14671540
return;
14681541

1542+
if (auto Report = shouldReportUnsafeTailCall(BC, BF, Inst, S))
1543+
Reports.push_back(*Report);
1544+
14691545
if (auto Report = shouldReportCallGadget(BC, Inst, S))
14701546
Reports.push_back(*Report);
14711547
if (auto Report = shouldReportSigningOracle(BC, Inst, S))

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

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -224,20 +224,33 @@ f_unreachable_instruction:
224224
ret
225225
.size f_unreachable_instruction, .-f_unreachable_instruction
226226

227-
// Expected false positive: without CFG, the state is reset to all-unsafe
228-
// after an unconditional branch.
229-
230-
.globl state_is_reset_after_indirect_branch_nocfg
231-
.type state_is_reset_after_indirect_branch_nocfg,@function
232-
state_is_reset_after_indirect_branch_nocfg:
233-
// CHECK-LABEL: GS-PAUTH: non-protected ret found in function state_is_reset_after_indirect_branch_nocfg, at address
234-
// CHECK-NEXT: The instruction is {{[0-9a-f]+}}: ret
227+
// Without CFG, the state is reset at labels, assuming every register that can
228+
// be clobbered in the function was actually clobbered.
229+
230+
.globl lr_untouched_nocfg
231+
.type lr_untouched_nocfg,@function
232+
lr_untouched_nocfg:
233+
// CHECK-NOT: lr_untouched_nocfg
234+
adr x2, 1f
235+
br x2
236+
1:
237+
ret
238+
.size lr_untouched_nocfg, .-lr_untouched_nocfg
239+
240+
.globl lr_clobbered_nocfg
241+
.type lr_clobbered_nocfg,@function
242+
lr_clobbered_nocfg:
243+
// CHECK-LABEL: GS-PAUTH: non-protected ret found in function lr_clobbered_nocfg, at address
244+
// CHECK-NEXT: The instruction is {{[0-9a-f]+}}: ret
235245
// CHECK-NEXT: The 0 instructions that write to the affected registers after any authentication are:
236246
adr x2, 1f
237247
br x2
238248
1:
249+
b 2f
250+
bl g // never executed, but affects the expected worst-case scenario
251+
2:
239252
ret
240-
.size state_is_reset_after_indirect_branch_nocfg, .-state_is_reset_after_indirect_branch_nocfg
253+
.size lr_clobbered_nocfg, .-lr_clobbered_nocfg
241254

242255
/// Now do a basic sanity check on every different Authentication instruction:
243256

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

Lines changed: 2 additions & 28 deletions
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)