From: Kuan-Ying Lee <kuan-ying.lee@canonical.com>
Date: Wed, 14 Aug 2024 08:51:19 +0000 (+0800)
Subject: aarch64: Add NT_ARM_PAC_* regset
X-Git-Tag: elfutils-0.192~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92ac55ef550a243dc0fab8b4c44cb217a4cb2524;p=thirdparty%2Felfutils.git

aarch64: Add NT_ARM_PAC_* regset

Add the NT_ARM_PAC_MASK and NT_ARM_PAC_ENABLED_KEYS for aarch64.
Recognize and print the new core item.

Signed-off-by: Kuan-Ying Lee <kuan-ying.lee@canonical.com>
---

diff --git a/backends/aarch64_corenote.c b/backends/aarch64_corenote.c
index 38b21de7..9966e427 100644
--- a/backends/aarch64_corenote.c
+++ b/backends/aarch64_corenote.c
@@ -127,6 +127,14 @@ static const Ebl_Core_Item aarch64_pac_items [] =
     }
   };
 
+static const Ebl_Core_Item aarch64_pac_enabled_items [] =
+  {
+    {
+      .name = "enabled_keys", .type = ELF_T_XWORD, .format = 'x',
+      .offset = 0, .group = "register"
+    }
+  };
+
 #define AARCH64_HWBP_REG(KIND, N)					\
     {									\
       .name = "DBG" KIND "VR" #N "_EL1", .type = ELF_T_XWORD, .format = 'x', \
@@ -189,6 +197,7 @@ AARCH64_BP_WP_GROUP ("W", aarch64_hw_wp_items);
   EXTRA_ITEMS (NT_ARM_HW_WATCH, 264, aarch64_hw_wp_items)		\
   EXTRA_ITEMS (NT_ARM_SYSTEM_CALL, 4, aarch64_syscall_items)		\
   EXTRA_ITEMS (NT_ARM_TAGGED_ADDR_CTRL, 8, aarch64_mte_items)		\
+  EXTRA_ITEMS (NT_ARM_PAC_ENABLED_KEYS, 8, aarch64_pac_enabled_items)	\
   EXTRA_ITEMS (NT_ARM_PAC_MASK, 16, aarch64_pac_items)
 
 #include "linux-core-note.c"
diff --git a/libebl/eblcorenotetypename.c b/libebl/eblcorenotetypename.c
index 7bb5333a..eab9a5dc 100644
--- a/libebl/eblcorenotetypename.c
+++ b/libebl/eblcorenotetypename.c
@@ -96,6 +96,8 @@ ebl_core_note_type_name (Ebl *ebl, uint32_t type, char *buf, size_t len)
 	    KNOWNSTYPE (ARM_SVE);
 	    KNOWNSTYPE (ARM_SSVE);
 	    KNOWNSTYPE (ARM_ZA);
+	    KNOWNSTYPE (ARM_PAC_ENABLED_KEYS);
+	    KNOWNSTYPE (ARM_PAC_MASK);
 	    KNOWNSTYPE (SIGINFO);
 	    KNOWNSTYPE (FILE);
 #undef KNOWNSTYPE