Re: [RFC PATCH v2 20/27] x86/cet/shstk: ELF header parsing of CET

diff --git a/arch/x86/kernel/elf.c b/arch/x86/kernel/elf.c
new file mode 100644
index 000000000000..233f6dad9c1f
--- /dev/null
+++ b/arch/x86/kernel/elf.c

+#define NOTE_SIZE_BAD(n, align, max) \
+       ((n->n_descsz < 8) || ((n->n_descsz % align) != 0) || \
+        (((u8 *)(n + 1) + 4 + n->n_descsz) > (max)))

+
+/*
+ * Go through the property array and look for the one
+ * with pr_type of GNU_PROPERTY_X86_FEATURE_1_AND.
+ */
+static u32 find_x86_feature_1(u8 *buf, u32 size, u32 align)
+{
+       u8 *end = buf + size;
+       u8 *ptr = buf;
+
+       while (1) {
+               u32 pr_type, pr_datasz;
+
+               if ((ptr + 4) >= end)
+                       break;

+               pr_type = *(u32 *)ptr;
+               pr_datasz = *(u32 *)(ptr + 4);
+               ptr += 8;
+
+               if ((ptr + pr_datasz) >= end)
+                       break;

+               if (pr_type == GNU_PROPERTY_X86_FEATURE_1_AND &&
+                   pr_datasz == 4)
+                       return *(u32 *)ptr;
+
+               ptr += pr_datasz;
+       }
+       return 0;
+}

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 0ac456b52bdd..3395f6a631d5 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c

@@ -1081,6 +1081,22 @@ static int load_elf_binary(struct linux_binprm *bprm)
                goto out_free_dentry;
        }

+#ifdef CONFIG_ARCH_HAS_PROGRAM_PROPERTIES
+
+       if (interpreter) {
+               retval = arch_setup_features(&loc->interp_elf_ex,
+                                            interp_elf_phdata,
+                                            interpreter, true);
+       } else {
+               retval = arch_setup_features(&loc->elf_ex,
+                                            elf_phdata,
+                                            bprm->file, false);
+       }