Skip to contentSkip to conversation

arm64: patching: Annotate text_addrs, new_insns with __counted_by_ptr()

PATCH RESEND New Thorsten Blum 1 participant 1 message Nov 11 arm64

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 arm64: patching: Annotate text_addrs, new_insns with __counted_by_ptr()

Add __counted_by_ptr() to aarch64_insn_patch::text_addrs and aarch64_insn_patch::new_insns to enable access bounds checking via CONFIG_UBSAN_BOUNDS and CONFIG_FORTIFY_SOURCE.

---
 arch/arm64/kernel/patching.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kernel/patching.c +2 -2
index 09f019c6547a..5fc7805a93f0 100644
@@ -194,8 +194,8 @@ int __kprobes aarch64_insn_patch_text_nosync(void *addr, u32 insn)
 }
 
 struct aarch64_insn_patch {
-	void		**text_addrs;
-	u32		*new_insns;
+	void		**text_addrs __counted_by_ptr(insn_cnt);
+	u32		*new_insns __counted_by_ptr(insn_cnt);
 	int		insn_cnt;
 	atomic_t	cpu_count;
 };