Blame SOURCES/0255-nx-add-memory-attribute-get-set-API.patch

b35c50
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
b35c50
From: Peter Jones <pjones@redhat.com>
b35c50
Date: Tue, 22 Mar 2022 10:56:21 -0400
b35c50
Subject: [PATCH] nx: add memory attribute get/set API
b35c50
b35c50
For NX, we need to set the page access permission attributes for write
b35c50
and execute permissions.
b35c50
b35c50
This patch adds two new primitives, grub_set_mem_attrs() and
b35c50
grub_clear_mem_attrs(), and associated constant definitions, to be used
b35c50
for that purpose.
b35c50
b35c50
For most platforms, it adds a dummy implementation that returns
b35c50
GRUB_ERR_NONE.  On EFI platforms, it adds a common helper function,
b35c50
grub_efi_status_to_err(), which translates EFI error codes to grub error
b35c50
codes, adds headers for the EFI Memory Attribute Protocol (still pending
b35c50
standardization), and an implementation of the grub nx primitives using
b35c50
it.
b35c50
b35c50
Signed-off-by: Peter Jones <pjones@redhat.com>
b35c50
[rharwood: add pjones's none/nyi fixup]
b35c50
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
b35c50
---
b35c50
 grub-core/kern/efi/efi.c |  36 +++++++++++++
b35c50
 grub-core/kern/efi/mm.c  | 131 +++++++++++++++++++++++++++++++++++++++++++++++
b35c50
 include/grub/efi/api.h   |  25 +++++++++
b35c50
 include/grub/efi/efi.h   |   2 +
b35c50
 include/grub/mm.h        |  32 ++++++++++++
b35c50
 5 files changed, 226 insertions(+)
b35c50
b35c50
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
b35c50
index 7fcca69c17..4ac2b2754e 100644
b35c50
--- a/grub-core/kern/efi/efi.c
b35c50
+++ b/grub-core/kern/efi/efi.c
b35c50
@@ -1096,3 +1096,39 @@ grub_efi_compare_device_paths (const grub_efi_device_path_t *dp1,
b35c50
 
b35c50
   return 0;
b35c50
 }
b35c50
+
b35c50
+grub_err_t
b35c50
+grub_efi_status_to_err (grub_efi_status_t status)
b35c50
+{
b35c50
+  grub_err_t err;
b35c50
+  switch (status)
b35c50
+    {
b35c50
+    case GRUB_EFI_SUCCESS:
b35c50
+      err = GRUB_ERR_NONE;
b35c50
+      break;
b35c50
+    case GRUB_EFI_INVALID_PARAMETER:
b35c50
+    default:
b35c50
+      err = GRUB_ERR_BAD_ARGUMENT;
b35c50
+      break;
b35c50
+    case GRUB_EFI_OUT_OF_RESOURCES:
b35c50
+      err = GRUB_ERR_OUT_OF_MEMORY;
b35c50
+      break;
b35c50
+    case GRUB_EFI_DEVICE_ERROR:
b35c50
+      err = GRUB_ERR_IO;
b35c50
+      break;
b35c50
+    case GRUB_EFI_WRITE_PROTECTED:
b35c50
+      err = GRUB_ERR_WRITE_ERROR;
b35c50
+      break;
b35c50
+    case GRUB_EFI_SECURITY_VIOLATION:
b35c50
+      err = GRUB_ERR_ACCESS_DENIED;
b35c50
+      break;
b35c50
+    case GRUB_EFI_NOT_FOUND:
b35c50
+      err = GRUB_ERR_FILE_NOT_FOUND;
b35c50
+      break;
b35c50
+    case GRUB_EFI_ABORTED:
b35c50
+      err = GRUB_ERR_WAIT;
b35c50
+      break;
b35c50
+    }
b35c50
+
b35c50
+  return err;
b35c50
+}
b35c50
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
b35c50
index e84961d078..2c33758ed7 100644
b35c50
--- a/grub-core/kern/efi/mm.c
b35c50
+++ b/grub-core/kern/efi/mm.c
b35c50
@@ -738,3 +738,134 @@ grub_efi_get_ram_base(grub_addr_t *base_addr)
b35c50
   return GRUB_ERR_NONE;
b35c50
 }
b35c50
 #endif
b35c50
+
b35c50
+static inline grub_uint64_t
b35c50
+grub_mem_attrs_to_uefi_mem_attrs (grub_uint64_t attrs)
b35c50
+{
b35c50
+  grub_uint64_t ret = GRUB_EFI_MEMORY_RP |
b35c50
+		      GRUB_EFI_MEMORY_RO |
b35c50
+		      GRUB_EFI_MEMORY_XP;
b35c50
+
b35c50
+  if (attrs & GRUB_MEM_ATTR_R)
b35c50
+    ret &= ~GRUB_EFI_MEMORY_RP;
b35c50
+
b35c50
+  if (attrs & GRUB_MEM_ATTR_W)
b35c50
+    ret &= ~GRUB_EFI_MEMORY_RO;
b35c50
+
b35c50
+  if (attrs & GRUB_MEM_ATTR_X)
b35c50
+    ret &= ~GRUB_EFI_MEMORY_XP;
b35c50
+
b35c50
+  return ret;
b35c50
+}
b35c50
+
b35c50
+static inline grub_uint64_t
b35c50
+uefi_mem_attrs_to_grub_mem_attrs (grub_uint64_t attrs)
b35c50
+{
b35c50
+  grub_uint64_t ret = GRUB_MEM_ATTR_R |
b35c50
+		      GRUB_MEM_ATTR_W |
b35c50
+		      GRUB_MEM_ATTR_X;
b35c50
+
b35c50
+  if (attrs & GRUB_EFI_MEMORY_RP)
b35c50
+    ret &= ~GRUB_MEM_ATTR_R;
b35c50
+
b35c50
+  if (attrs & GRUB_EFI_MEMORY_RO)
b35c50
+    ret &= ~GRUB_MEM_ATTR_W;
b35c50
+
b35c50
+  if (attrs & GRUB_EFI_MEMORY_XP)
b35c50
+    ret &= ~GRUB_MEM_ATTR_X;
b35c50
+
b35c50
+  return ret;
b35c50
+}
b35c50
+
b35c50
+grub_err_t
b35c50
+grub_get_mem_attrs (grub_addr_t addr, grub_size_t size, grub_uint64_t *attrs)
b35c50
+{
b35c50
+  grub_efi_memory_attribute_protocol_t *proto;
b35c50
+  grub_efi_physical_address_t physaddr = addr;
b35c50
+  grub_efi_guid_t protocol_guid = GRUB_EFI_MEMORY_ATTRIBUTE_PROTOCOL_GUID;
b35c50
+  grub_efi_status_t efi_status;
b35c50
+
b35c50
+  proto = grub_efi_locate_protocol (&protocol_guid, 0);
b35c50
+  if (!proto)
b35c50
+    return GRUB_ERR_NOT_IMPLEMENTED_YET;
b35c50
+
b35c50
+  if (physaddr & 0xfff || size & 0xfff || size == 0 || attrs == NULL)
b35c50
+    {
b35c50
+      grub_dprintf ("nx", "%s called on 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" and attrs %p\n",
b35c50
+		    __func__, physaddr, physaddr+size-1, attrs);
b35c50
+      return 0;
b35c50
+    }
b35c50
+
b35c50
+  efi_status = efi_call_4(proto->get_memory_attributes,
b35c50
+			  proto, physaddr, size, attrs);
b35c50
+  *attrs = uefi_mem_attrs_to_grub_mem_attrs (*attrs);
b35c50
+
b35c50
+  return grub_efi_status_to_err (efi_status);
b35c50
+}
b35c50
+
b35c50
+grub_err_t
b35c50
+grub_update_mem_attrs (grub_addr_t addr, grub_size_t size,
b35c50
+		       grub_uint64_t set_attrs, grub_uint64_t clear_attrs)
b35c50
+{
b35c50
+  grub_efi_memory_attribute_protocol_t *proto;
b35c50
+  grub_efi_physical_address_t physaddr = addr;
b35c50
+  grub_efi_guid_t protocol_guid = GRUB_EFI_MEMORY_ATTRIBUTE_PROTOCOL_GUID;
b35c50
+  grub_efi_status_t efi_status = GRUB_EFI_SUCCESS;
b35c50
+  grub_uint64_t before = 0, after = 0, uefi_set_attrs, uefi_clear_attrs;
b35c50
+  grub_err_t err;
b35c50
+
b35c50
+  proto = grub_efi_locate_protocol (&protocol_guid, 0);
b35c50
+  if (!proto)
b35c50
+    return GRUB_ERR_NONE;
b35c50
+
b35c50
+  err = grub_get_mem_attrs (addr, size, &before);
b35c50
+  if (err)
b35c50
+    grub_dprintf ("nx", "grub_get_mem_attrs(0x%"PRIxGRUB_ADDR", %"PRIuGRUB_SIZE", %p) -> 0x%x\n",
b35c50
+		  addr, size, &before, err);
b35c50
+
b35c50
+  if (physaddr & 0xfff || size & 0xfff || size == 0)
b35c50
+    {
b35c50
+      grub_dprintf ("nx", "%s called on 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" +%s%s%s -%s%s%s\n",
b35c50
+		    __func__, physaddr, physaddr + size - 1,
b35c50
+		    (set_attrs & GRUB_MEM_ATTR_R) ? "r" : "",
b35c50
+		    (set_attrs & GRUB_MEM_ATTR_W) ? "w" : "",
b35c50
+		    (set_attrs & GRUB_MEM_ATTR_X) ? "x" : "",
b35c50
+		    (clear_attrs & GRUB_MEM_ATTR_R) ? "r" : "",
b35c50
+		    (clear_attrs & GRUB_MEM_ATTR_W) ? "w" : "",
b35c50
+		    (clear_attrs & GRUB_MEM_ATTR_X) ? "x" : "");
b35c50
+      return 0;
b35c50
+    }
b35c50
+
b35c50
+  uefi_set_attrs = grub_mem_attrs_to_uefi_mem_attrs (set_attrs);
b35c50
+  grub_dprintf ("nx", "translating set_attrs from 0x%lx to 0x%lx\n", set_attrs, uefi_set_attrs);
b35c50
+  uefi_clear_attrs = grub_mem_attrs_to_uefi_mem_attrs (clear_attrs);
b35c50
+  grub_dprintf ("nx", "translating clear_attrs from 0x%lx to 0x%lx\n", clear_attrs, uefi_clear_attrs);
b35c50
+  if (uefi_set_attrs)
b35c50
+    efi_status = efi_call_4(proto->set_memory_attributes,
b35c50
+			    proto, physaddr, size, uefi_set_attrs);
b35c50
+  if (efi_status == GRUB_EFI_SUCCESS && uefi_clear_attrs)
b35c50
+    efi_status = efi_call_4(proto->clear_memory_attributes,
b35c50
+			    proto, physaddr, size, uefi_clear_attrs);
b35c50
+
b35c50
+  err = grub_get_mem_attrs (addr, size, &after);
b35c50
+  if (err)
b35c50
+    grub_dprintf ("nx", "grub_get_mem_attrs(0x%"PRIxGRUB_ADDR", %"PRIuGRUB_SIZE", %p) -> 0x%x\n",
b35c50
+		  addr, size, &after, err);
b35c50
+
b35c50
+  grub_dprintf ("nx", "set +%s%s%s -%s%s%s on 0x%"PRIxGRUB_ADDR"-0x%"PRIxGRUB_ADDR" before:%c%c%c after:%c%c%c\n",
b35c50
+		(set_attrs & GRUB_MEM_ATTR_R) ? "r" : "",
b35c50
+		(set_attrs & GRUB_MEM_ATTR_W) ? "w" : "",
b35c50
+		(set_attrs & GRUB_MEM_ATTR_X) ? "x" : "",
b35c50
+		(clear_attrs & GRUB_MEM_ATTR_R) ? "r" : "",
b35c50
+		(clear_attrs & GRUB_MEM_ATTR_W) ? "w" : "",
b35c50
+		(clear_attrs & GRUB_MEM_ATTR_X) ? "x" : "",
b35c50
+		addr, addr + size - 1,
b35c50
+		(before & GRUB_MEM_ATTR_R) ? 'r' : '-',
b35c50
+		(before & GRUB_MEM_ATTR_W) ? 'w' : '-',
b35c50
+		(before & GRUB_MEM_ATTR_X) ? 'x' : '-',
b35c50
+		(after & GRUB_MEM_ATTR_R) ? 'r' : '-',
b35c50
+		(after & GRUB_MEM_ATTR_W) ? 'w' : '-',
b35c50
+		(after & GRUB_MEM_ATTR_X) ? 'x' : '-');
b35c50
+
b35c50
+  return grub_efi_status_to_err (efi_status);
b35c50
+}
b35c50
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
b35c50
index f431f49973..464842ba37 100644
b35c50
--- a/include/grub/efi/api.h
b35c50
+++ b/include/grub/efi/api.h
b35c50
@@ -363,6 +363,11 @@
b35c50
       { 0x89, 0x29, 0x48, 0xbc, 0xd9, 0x0a, 0xd3, 0x1a } \
b35c50
   }
b35c50
 
b35c50
+#define GRUB_EFI_MEMORY_ATTRIBUTE_PROTOCOL_GUID \
b35c50
+  { 0xf4560cf6, 0x40ec, 0x4b4a, \
b35c50
+    { 0xa1, 0x92, 0xbf, 0x1d, 0x57, 0xd0, 0xb1, 0x89 } \
b35c50
+  }
b35c50
+
b35c50
 struct grub_efi_sal_system_table
b35c50
 {
b35c50
   grub_uint32_t signature;
b35c50
@@ -2102,6 +2107,26 @@ struct grub_efi_ip6_config_manual_address {
b35c50
 };
b35c50
 typedef struct grub_efi_ip6_config_manual_address grub_efi_ip6_config_manual_address_t;
b35c50
 
b35c50
+struct grub_efi_memory_attribute_protocol
b35c50
+{
b35c50
+  grub_efi_status_t (*get_memory_attributes) (
b35c50
+			    struct grub_efi_memory_attribute_protocol *this,
b35c50
+			    grub_efi_physical_address_t base_address,
b35c50
+			    grub_efi_uint64_t length,
b35c50
+			    grub_efi_uint64_t *attributes);
b35c50
+  grub_efi_status_t (*set_memory_attributes) (
b35c50
+			    struct grub_efi_memory_attribute_protocol *this,
b35c50
+			    grub_efi_physical_address_t base_address,
b35c50
+			    grub_efi_uint64_t length,
b35c50
+			    grub_efi_uint64_t attributes);
b35c50
+  grub_efi_status_t (*clear_memory_attributes) (
b35c50
+			    struct grub_efi_memory_attribute_protocol *this,
b35c50
+			    grub_efi_physical_address_t base_address,
b35c50
+			    grub_efi_uint64_t length,
b35c50
+			    grub_efi_uint64_t attributes);
b35c50
+};
b35c50
+typedef struct grub_efi_memory_attribute_protocol grub_efi_memory_attribute_protocol_t;
b35c50
+
b35c50
 #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \
b35c50
   || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) \
b35c50
   || defined(__riscv)
b35c50
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
b35c50
index ec52083c49..34825c4adc 100644
b35c50
--- a/include/grub/efi/efi.h
b35c50
+++ b/include/grub/efi/efi.h
b35c50
@@ -164,4 +164,6 @@ struct grub_net_card;
b35c50
 grub_efi_handle_t
b35c50
 grub_efinet_get_device_handle (struct grub_net_card *card);
b35c50
 
b35c50
+grub_err_t EXPORT_FUNC(grub_efi_status_to_err) (grub_efi_status_t status);
b35c50
+
b35c50
 #endif /* ! GRUB_EFI_EFI_HEADER */
b35c50
diff --git a/include/grub/mm.h b/include/grub/mm.h
b35c50
index 9c38dd3ca5..d81623d226 100644
b35c50
--- a/include/grub/mm.h
b35c50
+++ b/include/grub/mm.h
b35c50
@@ -22,6 +22,7 @@
b35c50
 
b35c50
 #include <grub/types.h>
b35c50
 #include <grub/symbol.h>
b35c50
+#include <grub/err.h>
b35c50
 #include <config.h>
b35c50
 
b35c50
 #ifndef NULL
b35c50
@@ -38,6 +39,37 @@ void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
b35c50
 void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
b35c50
 #endif
b35c50
 
b35c50
+#define GRUB_MEM_ATTR_R	0x0000000000000004LLU
b35c50
+#define GRUB_MEM_ATTR_W	0x0000000000000002LLU
b35c50
+#define GRUB_MEM_ATTR_X	0x0000000000000001LLU
b35c50
+
b35c50
+#ifdef GRUB_MACHINE_EFI
b35c50
+grub_err_t EXPORT_FUNC(grub_get_mem_attrs) (grub_addr_t addr,
b35c50
+					    grub_size_t size,
b35c50
+					    grub_uint64_t *attrs);
b35c50
+grub_err_t EXPORT_FUNC(grub_update_mem_attrs) (grub_addr_t addr,
b35c50
+					       grub_size_t size,
b35c50
+					       grub_uint64_t set_attrs,
b35c50
+					       grub_uint64_t clear_attrs);
b35c50
+#else /* !GRUB_MACHINE_EFI */
b35c50
+static inline grub_err_t
b35c50
+grub_get_mem_attrs (grub_addr_t addr __attribute__((__unused__)),
b35c50
+		    grub_size_t size __attribute__((__unused__)),
b35c50
+		    grub_uint64_t *attrs __attribute__((__unused__)))
b35c50
+{
b35c50
+  return GRUB_ERR_NONE;
b35c50
+}
b35c50
+
b35c50
+static inline grub_err_t
b35c50
+grub_update_mem_attrs (grub_addr_t addr __attribute__((__unused__)),
b35c50
+		       grub_size_t size __attribute__((__unused__)),
b35c50
+		       grub_uint64_t set_attrs __attribute__((__unused__)),
b35c50
+		       grub_uint64_t clear_attrs __attribute__((__unused__)))
b35c50
+{
b35c50
+  return GRUB_ERR_NONE;
b35c50
+}
b35c50
+#endif /* GRUB_MACHINE_EFI */
b35c50
+
b35c50
 void grub_mm_check_real (const char *file, int line);
b35c50
 #define grub_mm_check() grub_mm_check_real (GRUB_FILE, __LINE__);
b35c50