Skip to content

Commit f12d5f5

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 a5f1cf3 commit f12d5f5

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
@@ -431,6 +431,9 @@ class SrcSafetyAnalysis {
431431
}
432432

433433
SrcState computeNext(const MCInst &Point, const SrcState &Cur) {
434+
if (BC.MIB->isCFI(Point))
435+
return Cur;
436+
434437
SrcStatePrinter P(BC);
435438
LLVM_DEBUG({
436439
dbgs() << " SrcSafetyAnalysis::ComputeNext(";
@@ -676,6 +679,8 @@ class CFGUnawareSrcSafetyAnalysis : public SrcSafetyAnalysis {
676679
SrcState S = createEntryState();
677680
for (auto &I : BF.instrs()) {
678681
MCInst &Inst = I.second;
682+
if (BC.MIB->isCFI(Inst))
683+
continue;
679684

680685
// If there is a label before this instruction, it is possible that it
681686
// can be jumped-to, thus conservatively resetting S. As an exception,
@@ -961,6 +966,9 @@ class DstSafetyAnalysis {
961966
}
962967

963968
DstState computeNext(const MCInst &Point, const DstState &Cur) {
969+
if (BC.MIB->isCFI(Point))
970+
return Cur;
971+
964972
DstStatePrinter P(BC);
965973
LLVM_DEBUG({
966974
dbgs() << " DstSafetyAnalysis::ComputeNext(";
@@ -1137,6 +1145,8 @@ class CFGUnawareDstSafetyAnalysis : public DstSafetyAnalysis {
11371145
DstState S = createUnsafeState();
11381146
for (auto &I : llvm::reverse(BF.instrs())) {
11391147
MCInst &Inst = I.second;
1148+
if (BC.MIB->isCFI(Inst))
1149+
continue;
11401150

11411151
// If Inst can change the control flow, we cannot be sure that the next
11421152
// instruction (to be executed in analyzed program) is the one processed
@@ -1333,6 +1343,9 @@ void FunctionAnalysisContext::findUnsafeUses(
13331343
});
13341344

13351345
iterateOverInstrs(BF, [&](MCInstReference Inst) {
1346+
if (BC.MIB->isCFI(Inst))
1347+
return;
1348+
13361349
const SrcState &S = Analysis->getStateBefore(Inst);
13371350

13381351
// If non-empty state was never propagated from the entry basic block
@@ -1396,6 +1409,9 @@ void FunctionAnalysisContext::findUnsafeDefs(
13961409
});
13971410

13981411
iterateOverInstrs(BF, [&](MCInstReference Inst) {
1412+
if (BC.MIB->isCFI(Inst))
1413+
return;
1414+
13991415
const DstState &S = Analysis->getStateAfter(Inst);
14001416

14011417
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)