Skip to content

Commit 36837ce

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 e0c736c commit 36837ce

File tree

2 files changed

+48
-0
lines changed

2 files changed

+48
-0
lines changed

bolt/lib/Passes/PAuthGadgetScanner.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,9 @@ class SrcSafetyAnalysis {
429429
}
430430

431431
SrcState computeNext(const MCInst &Point, const SrcState &Cur) {
432+
if (BC.MIB->isCFI(Point))
433+
return Cur;
434+
432435
SrcStatePrinter P(BC);
433436
LLVM_DEBUG({
434437
dbgs() << " SrcSafetyAnalysis::ComputeNext(";
@@ -703,6 +706,8 @@ class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis,
703706
SrcState S = createEntryState();
704707
for (auto &I : BF.instrs()) {
705708
MCInst &Inst = I.second;
709+
if (BC.MIB->isCFI(Inst))
710+
continue;
706711

707712
// If there is a label before this instruction, it is possible that it
708713
// can be jumped-to, thus conservatively resetting S. As an exception,
@@ -982,6 +987,9 @@ class DstSafetyAnalysis {
982987
}
983988

984989
DstState computeNext(const MCInst &Point, const DstState &Cur) {
990+
if (BC.MIB->isCFI(Point))
991+
return Cur;
992+
985993
DstStatePrinter P(BC);
986994
LLVM_DEBUG({
987995
dbgs() << " DstSafetyAnalysis::ComputeNext(";
@@ -1151,6 +1159,8 @@ class CFGUnawareDstSafetyAnalysis : public DstSafetyAnalysis,
11511159
DstState S = createUnsafeState();
11521160
for (auto &I : llvm::reverse(BF.instrs())) {
11531161
MCInst &Inst = I.second;
1162+
if (BC.MIB->isCFI(Inst))
1163+
continue;
11541164

11551165
// If Inst can change the control flow, we cannot be sure that the next
11561166
// instruction (to be executed in analyzed program) is the one processed
@@ -1341,6 +1351,9 @@ void FunctionAnalysisContext::findUnsafeUses(
13411351
});
13421352

13431353
iterateOverInstrs(BF, [&](MCInstReference Inst) {
1354+
if (BC.MIB->isCFI(Inst))
1355+
return;
1356+
13441357
const SrcState &S = Analysis->getStateBefore(Inst);
13451358

13461359
// If non-empty state was never propagated from the entry basic block
@@ -1404,6 +1417,9 @@ void FunctionAnalysisContext::findUnsafeDefs(
14041417
});
14051418

14061419
iterateOverInstrs(BF, [&](MCInstReference Inst) {
1420+
if (BC.MIB->isCFI(Inst))
1421+
return;
1422+
14071423
const DstState &S = Analysis->getStateAfter(Inst);
14081424

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

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

Lines changed: 32 additions & 0 deletions
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, Insts: [0](0x{{[0-9a-f]+}} )>
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)