nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

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

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