Skip to content

[AArch64][PAC] Emit a fatal error when ptrauth target feature is missing #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: elf-pauth
Choose a base branch
from
Open

[AArch64][PAC] Emit a fatal error when ptrauth target feature is missing #62

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e31206a
[AArch64][PAC] Emit a fatal error when ptrauth target feature is missing
kovdan01 Dec 4, 2023
ccfa70e
Pass `-debug` option to llc only on assertion-enabled builds
kovdan01 Dec 6, 2023
52afe42
Use `-debug-only=aarch64-expand-hardened-pseudos` instead of `-debug`
kovdan01 Dec 7, 2023
81cb742
Ensure that ptrauth subtarget feature is checked for ptrauth-returns
kovdan01 Dec 7, 2023
3821445
Ensure AUTH_CALL is not emitted when ptrauth subtarget feature is mis…
kovdan01 Dec 7, 2023
9ed8fc6
Use CHECK-NEXT instead of CHECK when suitable
kovdan01 Dec 7, 2023
bffc609
Add error messages for emitting LDRA* pseudos without PAuth subtarget…
kovdan01 Dec 8, 2023
8e30a83
Use opaque pointers
kovdan01 Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions llvm/lib/Target/AArch64/AArch64ExpandHardenedPseudos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ bool AArch64ExpandHardenedPseudos::expandPtrAuthPseudo(MachineInstr &MI) {
if (MI.getOpcode() == AArch64::LOADauthptrgot) {
LLVM_DEBUG(dbgs() << "Expanding: " << MI << "\n");

if (!STI.hasPAuth())
report_fatal_error("pac instructions require ptrauth target feature");

const TargetMachine &TM = MF.getTarget();
MachineModuleInfo &MMI = MF.getMMI();

Expand Down Expand Up @@ -223,6 +226,9 @@ bool AArch64ExpandHardenedPseudos::expandPtrAuthPseudo(MachineInstr &MI) {

LLVM_DEBUG(dbgs() << "Expanding: " << MI << "\n");

if (!STI.hasPAuth())
report_fatal_error("pac instructions require ptrauth target feature");

const bool IsGOTLoad = MI.getOpcode() == AArch64::LOADgotPAC;
MachineOperand GAOp = MI.getOperand(0);
auto Key = (AArch64PACKey::ID)MI.getOperand(1).getImm();
Expand Down
58 changes: 58 additions & 0 deletions llvm/test/CodeGen/AArch64/GlobalISel/ptrauth-lowering-err-debug.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
; REQUIRES: asserts
; RUN: split-file %s %t && cd %t

;--- MOVaddrPAC.ll

; RUN: not --crash llc -debug -mtriple aarch64-elf MOVaddrPAC.ll 2>&1 | \
Copy link
Contributor

@atrosinenko atrosinenko Dec 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-debug may be replaced with -debug-only=aarch64-expand-hardened-pseudos for less verbose debug output (not sure which is more canonical in tests, though).

Copy link
Contributor

@asl asl Dec 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

Copy link
Contributor Author

@kovdan01 kovdan01 Dec 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, fixed in 52afe42

; RUN: FileCheck MOVaddrPAC.ll

; CHECK: Expanding: MOVaddrPAC @foo
; CHECK: LLVM ERROR: pac instructions require ptrauth target feature

@foo.ptrauth = private constant { ptr, i32, i64, i64 } { ptr @foo, i32 0, i64 0, i64 0 }, section "llvm.ptrauth", align 8

define ptr @bar() #0 {
ret ptr @foo.ptrauth
}

define private void @foo() {
ret void
}

attributes #0 = { "ptrauth-calls" "target-cpu"="generic" }

;--- LOADgotPAC.ll

; RUN: not --crash llc -debug -mtriple aarch64-elf LOADgotPAC.ll 2>&1 | \
; RUN: FileCheck LOADgotPAC.ll

; CHECK: Expanding: LOADgotPAC @foo
; CHECK: LLVM ERROR: pac instructions require ptrauth target feature

@foo.ptrauth = private constant { ptr, i32, i64, i64 } { ptr @foo, i32 0, i64 0, i64 0 }, section "llvm.ptrauth", align 8

define ptr @bar() #0 {
ret ptr @foo.ptrauth
}

declare void @foo()

attributes #0 = { "ptrauth-calls" "target-cpu"="generic" }

;--- LOADauthptrgot.ll

; RUN: not --crash llc -debug -mtriple aarch64-elf LOADauthptrgot.ll 2>&1 | \
; RUN: FileCheck LOADauthptrgot.ll

; CHECK: Expanding: {{.*}}LOADauthptrgot @g_weak
; CHECK: LLVM ERROR: pac instructions require ptrauth target feature

define i8* @foo() #0 {
%tmp = bitcast { i8*, i32, i64, i64 }* @g_weak.ptrauth to i8*
ret i8* %tmp
}

@g_weak = extern_weak global i32
@g_weak.ptrauth = private constant { i8*, i32, i64, i64 } { i8* bitcast (i32* @g_weak to i8*), i32 0, i64 0, i64 0 }, section "llvm.ptrauth"
Copy link
Contributor

@atrosinenko atrosinenko Dec 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typed pointers.

Copy link
Contributor Author

@kovdan01 kovdan01 Dec 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 8e30a83


attributes #0 = { "ptrauth-calls" "target-cpu"="generic" }
54 changes: 54 additions & 0 deletions llvm/test/CodeGen/AArch64/GlobalISel/ptrauth-lowering-err.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
; RUN: split-file %s %t && cd %t

;--- MOVaddrPAC.ll

; RUN: not --crash llc -mtriple aarch64-elf MOVaddrPAC.ll 2>&1 | \
; RUN: FileCheck MOVaddrPAC.ll

; CHECK: LLVM ERROR: pac instructions require ptrauth target feature

@foo.ptrauth = private constant { ptr, i32, i64, i64 } { ptr @foo, i32 0, i64 0, i64 0 }, section "llvm.ptrauth", align 8

define ptr @bar() #0 {
ret ptr @foo.ptrauth
}

define private void @foo() {
ret void
}

attributes #0 = { "ptrauth-calls" "target-cpu"="generic" }

;--- LOADgotPAC.ll

; RUN: not --crash llc -mtriple aarch64-elf LOADgotPAC.ll 2>&1 | \
; RUN: FileCheck LOADgotPAC.ll

; CHECK: LLVM ERROR: pac instructions require ptrauth target feature

@foo.ptrauth = private constant { ptr, i32, i64, i64 } { ptr @foo, i32 0, i64 0, i64 0 }, section "llvm.ptrauth", align 8

define ptr @bar() #0 {
ret ptr @foo.ptrauth
}

declare void @foo()

attributes #0 = { "ptrauth-calls" "target-cpu"="generic" }

;--- LOADauthptrgot.ll

; RUN: not --crash llc -mtriple aarch64-elf LOADauthptrgot.ll 2>&1 | \
; RUN: FileCheck LOADauthptrgot.ll

; CHECK: LLVM ERROR: pac instructions require ptrauth target feature

define i8* @foo() #0 {
%tmp = bitcast { i8*, i32, i64, i64 }* @g_weak.ptrauth to i8*
ret i8* %tmp
}

@g_weak = extern_weak global i32
@g_weak.ptrauth = private constant { i8*, i32, i64, i64 } { i8* bitcast (i32* @g_weak to i8*), i32 0, i64 0, i64 0 }, section "llvm.ptrauth"
Copy link
Contributor

@atrosinenko atrosinenko Dec 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typed pointers.

Copy link
Contributor Author

@kovdan01 kovdan01 Dec 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 8e30a83


attributes #0 = { "ptrauth-calls" "target-cpu"="generic" }