aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2022-02-23 19:34:31 -0800
committerKees Cook <keescook@chromium.org>2022-03-01 16:16:28 -0800
commit4f0bfdfd8323e5b461fc1042143a1097dba9fced (patch)
treeb7a89c1feb34fcdce18ab6d7b1451700b646cdbc
parentMAINTAINERS: Update execve entry with more details (diff)
downloadlinux-dev-4f0bfdfd8323e5b461fc1042143a1097dba9fced.tar.xz
linux-dev-4f0bfdfd8323e5b461fc1042143a1097dba9fced.zip
ELF: Properly redefine PT_GNU_* in terms of PT_LOOS
The PT_GNU_* program header types are actually offsets from PT_LOOS, so redefine them as such, reorder them, and add the missing PT_GNU_RELRO. Cc: Eric Biederman <ebiederm@xmission.com> Cc: Peter Collingbourne <pcc@google.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Dave Martin <Dave.Martin@arm.com> Signed-off-by: Kees Cook <keescook@chromium.org>
-rw-r--r--include/uapi/linux/elf.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index 61bf4774b8f2..6438d55529bf 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -35,10 +35,11 @@ typedef __s64 Elf64_Sxword;
#define PT_HIOS 0x6fffffff /* OS-specific */
#define PT_LOPROC 0x70000000
#define PT_HIPROC 0x7fffffff
-#define PT_GNU_EH_FRAME 0x6474e550
-#define PT_GNU_PROPERTY 0x6474e553
-
+#define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550)
#define PT_GNU_STACK (PT_LOOS + 0x474e551)
+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
+#define PT_GNU_PROPERTY (PT_LOOS + 0x474e553)
+
/*
* Extended Numbering