Skip to content

arm64: return address signing

Amit Daniel Kachhap linux-arm-kernel linux-kbuild 8 versions – Applied

Status from this message: Queued for 5.7. Thanks.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v7 Latest17 patches 3 repliesApplied
  2. v618 patches 45 repliesSuperseded
  3. v517 patches 14 repliesSuperseded
Earlier versions · 5
VersionPostedPatchesRepliesStatus
v417 patches6 repliesSuperseded
v3 posting 2/20 of 16 patches0 repliesSuperseded
v3 posting 1/216 patches42 repliesSuperseded
v214 patches21 repliesSuperseded
v111 patches13 repliesSuperseded

Patches in v7 Applied

#Subject and filesSizeRepliesApplied
1/17arm64: cpufeature: Fix meta-capability cpufeature checkarch/arm64/kernel/cpufeature.c+20 -10 replies
2/17arm64: cpufeature: add pointer auth meta-capabilitiesarch/arm64/include/asm/cpucaps.h arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c+29 -60 replies
3/17arm64: rename ptrauth key structures to be user-specificarch/arm64/include/asm/pointer_auth.h arch/arm64/include/asm/processor.h arch/arm64/kernel/pointer_auth.c +1 more+19 -190 replies
4/17arm64: install user ptrauth keys at kernel exit timearch/arm64/include/asm/asm_pointer_auth.h arch/arm64/include/asm/pointer_auth.h arch/arm64/kernel/asm-offsets.c +3 more+64 -260 replies
5/17arm64: ptrauth: Add bootup/runtime flags for __cpu_setuparch/arm64/include/asm/smp.h arch/arm64/kernel/head.S arch/arm64/kernel/sleep.S +1 more+27 -110 replies
6/17arm64: cpufeature: Move cpu capability helpers inside C filearch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c+13 -120 replies
7/17arm64: cpufeature: handle conflicts based on capabilityarch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c+25 -160 replies
8/17arm64: enable ptrauth earlierarch/arm64/Kconfig arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c +1 more+49 -100 replies
9/17arm64: initialize and switch ptrauth kernel keysarch/arm64/include/asm/asm_pointer_auth.h arch/arm64/include/asm/pointer_auth.h arch/arm64/include/asm/processor.h +6 more+62 -00 replies
10/17arm64: initialize ptrauth keys for kernel booting taskarch/arm64/include/asm/pointer_auth.h arch/arm64/include/asm/stackprotector.h include/linux/stackprotector.h+16 -20 replies
11/17arm64: mask PAC bits of __builtin_return_addressarch/arm64/Kconfig arch/arm64/include/asm/compiler.h arch/arm64/include/asm/pointer_auth.h+26 -80 replies
12/17arm64: unwind: strip PAC from kernel addressesarch/arm64/kernel/stacktrace.c+4 -10 replies
13/17arm64: __show_regs: strip PAC from lr in printkarch/arm64/kernel/process.c+1 -10 replies
14/17arm64: suspend: restore the kernel ptrauth keysarch/arm64/include/asm/asm_pointer_auth.h arch/arm64/kernel/entry.S arch/arm64/mm/proc.S+8 -40 replies
15/17kconfig: Add support for 'as-option'scripts/Kconfig.include+6 -02 replies
16/17arm64: compile the kernel with ptrauth return address signingarch/arm64/Kconfig arch/arm64/Makefile+34 -13 replies
17/17lkdtm: arm64: test kernel pointer authenticationdrivers/misc/lkdtm/bugs.c drivers/misc/lkdtm/core.c drivers/misc/lkdtm/lkdtm.h+38 -00 replies

Reviews trailers per patch

All 17 patches have a Reviewed-by or Acked-by.

PatchVincenzo FrascinoSuzuki K PouloseKees CookMasahiro YamadaCatalin MarinasJames MorseNathan Chancellor
1/17R-b
2/17R-b R-b R-b
3/17R-b A-b
4/17R-b R-b R-b
5/17R-b R-b R-b
6/17R-b
7/17R-b R-b R-b
8/17R-b R-b R-b
9/17R-b R-b R-b
10/17R-b R-b
11/17R-b
12/17R-b A-b R-b
13/17R-b A-b
14/17R-b
15/17A-b
16/17R-b R-b R-b T-b
17/17A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 7 reviewers.

Read the v7 thread

Cover letter [PATCH v7 00/17] arm64: return address signing

Hi,

This series improves function return address protection for the arm64 kernel, by compiling the kernel with ARMv8.3 Pointer Authentication instructions (referred ptrauth hereafter). This should help protect the kernel against attacks using return-oriented programming.

Changes since v6 [1]:
- Dropped patch "arm64: create macro to park cpu in an infinite loop" as this clean up patch is not relevant for this series.
- Fixed backtrace when Function graph tracer is used as pointed by James.
- Added DYNAMIC_FTRACE_WITH_REGS config dependency as pointed by James.
- Several minor comments from Vincenzo.
- Added Reviewed-bys from James and Vincenzo.
- Rebased the patch series to v5.6-rc5.

Changes since v5 [2]:
- Added a new patch(arm64: cpufeature: Move cpu capability..) to move cpucapability type helpers in cpufeature.c file. This makes adding new cpucapability easier.
- Moved kernel key restore to function __cpu_setup(proc.S) as suggested by Catalin.
- More comments for as-option Kconfig option for concerns raised by Masahiro.
- Clarified comments for -march=armv8.3-a non-integrated assembler option.

Some additional work not implemented below will be taken up separately:
- kdump tools may need some rework to work with ptrauth. The kdump tools may need the ptrauth information to strip PAC bits. This will be sent in a separate patch.
- Few more ptrauth generic lkdtm tests as requested by Kees Cook.
- Generate compile time warnings if requested Kconfig feature not supported by compilers.
- KVM host will now need just APIA key to be saved and restored. Userpace should also behave according to it. More details here [3].

This complete series can be found at (git://linux-arm.org/linux-ak.git PAC_mainline_v7) for reference.

Patch 5 in this series "arm64: ptrauth: Add bootup/runtime flags for __cpu_setup" will have minor conflict with Ionela's commit "87a1f063464afd9 (arm64: trap to EL1 accesses to AMU counters from EL0)" in -next.

Feedback welcome!

Thanks,
Amit Daniel

[1]: http://lists.infradead.org/pipermail/linux-arm-kernel/2020-March/716268.html
[2]: http://lists.infradead.org/pipermail/linux-arm-kernel/2020-February/711699.html
[3]: http://lists.infradead.org/pipermail/linux-arm-kernel/2020-March/717847.html

Amit Daniel Kachhap (8):
arm64: cpufeature: Fix meta-capability cpufeature check
arm64: ptrauth: Add bootup/runtime flags for __cpu_setup
arm64: cpufeature: Move cpu capability helpers inside C file
arm64: initialize ptrauth keys for kernel booting task
arm64: mask PAC bits of __builtin_return_address
arm64: __show_regs: strip PAC from lr in printk
arm64: suspend: restore the kernel ptrauth keys
lkdtm: arm64: test kernel pointer authentication

Kristina Martsenko (7):
arm64: cpufeature: add pointer auth meta-capabilities
arm64: rename ptrauth key structures to be user-specific
arm64: install user ptrauth keys at kernel exit time
arm64: cpufeature: handle conflicts based on capability
arm64: enable ptrauth earlier
arm64: initialize and switch ptrauth kernel keys
arm64: compile the kernel with ptrauth return address signing

Mark Rutland (1):
arm64: unwind: strip PAC from kernel addresses

Vincenzo Frascino (1):
kconfig: Add support for 'as-option'

 arch/arm64/Kconfig                        | 31 ++++++++++-
 arch/arm64/Makefile                       | 11 ++++
 arch/arm64/include/asm/asm_pointer_auth.h | 65 +++++++++++++++++++++
 arch/arm64/include/asm/compiler.h         | 24 ++++++++
 arch/arm64/include/asm/cpucaps.h          |  4 +-
 arch/arm64/include/asm/cpufeature.h       | 39 +++++++------
 arch/arm64/include/asm/pointer_auth.h     | 50 ++++++++---------
 arch/arm64/include/asm/processor.h        |  3 +-
 arch/arm64/include/asm/smp.h              | 12 ++++
 arch/arm64/include/asm/stackprotector.h   |  5 ++
 arch/arm64/kernel/asm-offsets.c           | 16 ++++++
 arch/arm64/kernel/cpufeature.c            | 93 +++++++++++++++++++++++--------
 arch/arm64/kernel/entry.S                 |  6 ++
 arch/arm64/kernel/head.S                  |  2 +
 arch/arm64/kernel/pointer_auth.c          |  7 +--
 arch/arm64/kernel/process.c               |  5 +-
 arch/arm64/kernel/ptrace.c                | 16 +++---
 arch/arm64/kernel/sleep.S                 |  2 +
 arch/arm64/kernel/smp.c                   |  8 +++
 arch/arm64/kernel/stacktrace.c            |  5 +-
 arch/arm64/mm/proc.S                      | 71 +++++++++++++++++++----
 drivers/misc/lkdtm/bugs.c                 | 36 ++++++++++++
 drivers/misc/lkdtm/core.c                 |  1 +
 drivers/misc/lkdtm/lkdtm.h                |  1 +
 include/linux/stackprotector.h            |  2 +-
 scripts/Kconfig.include                   |  6 ++
 26 files changed, 422 insertions(+), 99 deletions(-)
 create mode 100644 arch/arm64/include/asm/asm_pointer_auth.h
 create mode 100644 arch/arm64/include/asm/compiler.h
Signature · 7 lines
2.7.4


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel