Skip to content

Commit f49ccac

Browse files
committed
[BOLT] Gadget scanner: do not crash on debug-printing CFI instructions
Some instruction-printing code used under LLVM_DEBUG does not handle CFI instructions well. While CFI instructions seem to be harmless for the correctness of the analysis results, they do not convey any useful information to the analysis either, so skip them early.
1 parent 7bb423f commit f49ccac

File tree

2 files changed

+48
-0
lines changed

2 files changed

+48
-0
lines changed

bolt/lib/Passes/PAuthGadgetScanner.cpp

+16
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,9 @@ class SrcSafetyAnalysis {
433433
}
434434

435435
SrcState computeNext(const MCInst &Point, const SrcState &Cur) {
436+
if (BC.MIB->isCFI(Point))
437+
return Cur;
438+
436439
SrcStatePrinter P(BC);
437440
LLVM_DEBUG({
438441
dbgs() << " SrcSafetyAnalysis::ComputeNext(";
@@ -672,6 +675,8 @@ class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis {
672675
SrcState S = createEntryState();
673676
for (auto &I : BF.instrs()) {
674677
MCInst &Inst = I.second;
678+
if (BC.MIB->isCFI(Inst))
679+
continue;
675680

676681
// If there is a label before this instruction, it is possible that it
677682
// can be jumped-to, thus conservatively resetting S. As an exception,
@@ -950,6 +955,9 @@ class DstSafetyAnalysis {
950955
}
951956

952957
DstState computeNext(const MCInst &Point, const DstState &Cur) {
958+
if (BC.MIB->isCFI(Point))
959+
return Cur;
960+
953961
DstStatePrinter P(BC);
954962
LLVM_DEBUG({
955963
dbgs() << " DstSafetyAnalysis::ComputeNext(";
@@ -1126,6 +1134,8 @@ class CFGUnawareDstSafetyAnalysis : public DstSafetyAnalysis {
11261134
DstState S = createUnsafeState();
11271135
for (auto &I : llvm::reverse(BF.instrs())) {
11281136
MCInst &Inst = I.second;
1137+
if (BC.MIB->isCFI(Inst))
1138+
continue;
11291139

11301140
// If Inst can change the control flow, we cannot be sure that the next
11311141
// instruction (to be executed in analyzed program) is the one processed
@@ -1322,6 +1332,9 @@ void FunctionAnalysis::findUnsafeUses(
13221332
});
13231333

13241334
iterateOverInstrs(BF, [&](MCInstReference Inst) {
1335+
if (BC.MIB->isCFI(Inst))
1336+
return;
1337+
13251338
const SrcState &S = Analysis->getStateBefore(Inst);
13261339

13271340
// If non-empty state was never propagated from the entry basic block
@@ -1385,6 +1398,9 @@ void FunctionAnalysis::findUnsafeDefs(
13851398
});
13861399

13871400
iterateOverInstrs(BF, [&](MCInstReference Inst) {
1401+
if (BC.MIB->isCFI(Inst))
1402+
return;
1403+
13881404
const DstState &S = Analysis->getStateAfter(Inst);
13891405

13901406
if (auto Report = shouldReportAuthOracle(BC, Inst, S))

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

+32
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,38 @@ auth_oracle:
329329
// PAUTH-EMPTY:
330330
// PAUTH-NEXT: Attaching leakage info to: 00000000: autia x0, x1 # DataflowDstSafetyAnalysis: dst-state<CannotEscapeUnchecked: BitVector>
331331

332+
// Gadget scanner should not crash on CFI instructions, including when debug-printing them.
333+
// Note that the particular debug output is not checked, but BOLT should be
334+
// compiled with assertions enabled to support -debug-only argument.
335+
336+
.globl cfi_inst_df
337+
.type cfi_inst_df,@function
338+
cfi_inst_df:
339+
.cfi_startproc
340+
sub sp, sp, #16
341+
.cfi_def_cfa_offset 16
342+
add sp, sp, #16
343+
.cfi_def_cfa_offset 0
344+
ret
345+
.size cfi_inst_df, .-cfi_inst_df
346+
.cfi_endproc
347+
348+
.globl cfi_inst_nocfg
349+
.type cfi_inst_nocfg,@function
350+
cfi_inst_nocfg:
351+
.cfi_startproc
352+
sub sp, sp, #16
353+
.cfi_def_cfa_offset 16
354+
355+
adr x0, 1f
356+
br x0
357+
1:
358+
add sp, sp, #16
359+
.cfi_def_cfa_offset 0
360+
ret
361+
.size cfi_inst_nocfg, .-cfi_inst_nocfg
362+
.cfi_endproc
363+
332364
// CHECK-LABEL:Analyzing function main, AllocatorId = 1
333365
.globl main
334366
.type main,@function

0 commit comments

Comments
 (0)