Blame SOURCES/0549-modules-load-module-sections-at-page-aligned-address.patch

bf0270
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
bf0270
From: Peter Jones <pjones@redhat.com>
bf0270
Date: Mon, 21 Mar 2022 17:45:40 -0400
bf0270
Subject: [PATCH] modules: load module sections at page-aligned addresses
bf0270
bf0270
Currently we load module sections at whatever alignment gcc+ld happened
bf0270
to dump into the ELF section header, which is often pretty useless.  For
bf0270
example, by default time.mod has these sections on a current x86_64
bf0270
build:
bf0270
bf0270
$ eu-readelf -a grub-core/time.mod |& grep ^Section -A13
bf0270
Section Headers:
bf0270
[Nr] Name            Type         Addr  Off      Size     ES Flags Lk Inf Al
bf0270
[ 0]                 NULL         0     00000000 00000000  0        0   0  0
bf0270
[ 1] .text           PROGBITS     0     00000040 0000015e  0 AX     0   0  1
bf0270
[ 2] .rela.text      RELA         0     00000458 000001e0 24 I      8   1  8
bf0270
[ 3] .rodata.str1.1  PROGBITS     0     0000019e 000000a1  1 AMS    0   0  1
bf0270
[ 4] .module_license PROGBITS     0     00000240 0000000f  0 A      0   0  8
bf0270
[ 5] .data           PROGBITS     0     0000024f 00000000  0 WA     0   0  1
bf0270
[ 6] .bss            NOBITS       0     00000250 00000008  0 WA     0   0  8
bf0270
[ 7] .modname        PROGBITS     0     00000250 00000005  0        0   0  1
bf0270
[ 8] .symtab         SYMTAB       0     00000258 00000150 24        9   6  8
bf0270
[ 9] .strtab         STRTAB       0     000003a8 000000ab  0        0   0  1
bf0270
[10] .shstrtab       STRTAB       0     00000638 00000059  0        0   0  1
bf0270
bf0270
With NX protections being page based, loading sections with either a 1
bf0270
or 8 *byte* alignment does absolutely nothing to help us out.
bf0270
bf0270
This patch switches most EFI platforms to load module sections at 4kB
bf0270
page-aligned addresses.  To do so, it adds an new per-arch function,
bf0270
grub_arch_dl_min_alignment(), which returns the alignment needed for
bf0270
dynamically loaded sections (in bytes).  Currently it sets it to 4096
bf0270
when GRUB_MACHINE_EFI is true on x86_64, i386, arm, arm64, and emu, and
bf0270
1-byte alignment on everything else.
bf0270
bf0270
It then changes the allocation size computation and the loader code in
bf0270
grub_dl_load_segments() to align the locations and sizes up to these
bf0270
boundaries, and fills any added padding with zeros.
bf0270
bf0270
All of this happens before relocations are applied, so the relocations
bf0270
factor that in with no change.
bf0270
bf0270
As an aside, initially Daniel Kiper and I thought that it might be a
bf0270
better idea to split the modules up into top-level sections as
bf0270
.text.modules, .rodata.modules, .data.modules, etc., so that their page
bf0270
permissions would get set by the loader that's loading grub itself.
bf0270
This turns out to have two significant downsides: 1) either in mkimage
bf0270
or in grub_dl_relocate_symbols(), you wind up having to dynamically
bf0270
process the relocations to accommodate the moved module sections, and 2)
bf0270
you then need to change the permissions on the modules and change them
bf0270
back while relocating them in grub_dl_relocate_symbols(), which means
bf0270
that any loader that /does/ honor the section flags but does /not/
bf0270
generally support NX with the memory attributes API will cause grub to
bf0270
fail.
bf0270
bf0270
Signed-off-by: Peter Jones <pjones@redhat.com>
bf0270
(cherry picked from commit 31d52500b281619d92b03b2c2d30fe15aedaf326)
bf0270
(cherry picked from commit 04f1df6b665493e38de66018aebe377fdac4ceec)
bf0270
[rharwood: not risc-v yet]
bf0270
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
bf0270
---
bf0270
 grub-core/kern/arm/dl.c     | 13 +++++++++++++
bf0270
 grub-core/kern/arm64/dl.c   | 13 +++++++++++++
bf0270
 grub-core/kern/dl.c         | 29 +++++++++++++++++++++--------
bf0270
 grub-core/kern/emu/full.c   | 13 +++++++++++++
bf0270
 grub-core/kern/i386/dl.c    | 13 +++++++++++++
bf0270
 grub-core/kern/ia64/dl.c    |  9 +++++++++
bf0270
 grub-core/kern/mips/dl.c    |  8 ++++++++
bf0270
 grub-core/kern/powerpc/dl.c |  9 +++++++++
bf0270
 grub-core/kern/sparc64/dl.c |  9 +++++++++
bf0270
 grub-core/kern/x86_64/dl.c  | 13 +++++++++++++
bf0270
 include/grub/dl.h           |  2 ++
bf0270
 docs/grub-dev.texi          |  6 +++---
bf0270
 12 files changed, 126 insertions(+), 11 deletions(-)
bf0270
bf0270
diff --git a/grub-core/kern/arm/dl.c b/grub-core/kern/arm/dl.c
bf0270
index eab9d17ff2..9260737936 100644
bf0270
--- a/grub-core/kern/arm/dl.c
bf0270
+++ b/grub-core/kern/arm/dl.c
bf0270
@@ -278,3 +278,16 @@ grub_arch_dl_check_header (void *ehdr)
bf0270
 
bf0270
   return GRUB_ERR_NONE;
bf0270
 }
bf0270
+
bf0270
+/*
bf0270
+ * Tell the loader what our minimum section alignment is.
bf0270
+ */
bf0270
+grub_size_t
bf0270
+grub_arch_dl_min_alignment (void)
bf0270
+{
bf0270
+#ifdef GRUB_MACHINE_EFI
bf0270
+  return 4096;
bf0270
+#else
bf0270
+  return 1;
bf0270
+#endif
bf0270
+}
bf0270
diff --git a/grub-core/kern/arm64/dl.c b/grub-core/kern/arm64/dl.c
bf0270
index fb03373190..826f8e721e 100644
bf0270
--- a/grub-core/kern/arm64/dl.c
bf0270
+++ b/grub-core/kern/arm64/dl.c
bf0270
@@ -191,3 +191,16 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
bf0270
 
bf0270
   return GRUB_ERR_NONE;
bf0270
 }
bf0270
+
bf0270
+/*
bf0270
+ * Tell the loader what our minimum section alignment is.
bf0270
+ */
bf0270
+grub_size_t
bf0270
+grub_arch_dl_min_alignment (void)
bf0270
+{
bf0270
+#ifdef GRUB_MACHINE_EFI
bf0270
+  return 4096;
bf0270
+#else
bf0270
+  return 1;
bf0270
+#endif
bf0270
+}
bf0270
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
bf0270
index ba1b33c20b..5c2153acf9 100644
bf0270
--- a/grub-core/kern/dl.c
bf0270
+++ b/grub-core/kern/dl.c
bf0270
@@ -278,7 +278,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
bf0270
 {
bf0270
   unsigned i;
bf0270
   const Elf_Shdr *s;
bf0270
-  grub_size_t tsize = 0, talign = 1;
bf0270
+  grub_size_t tsize = 0, talign = 1, arch_addralign = 1;
bf0270
 #if !defined (__i386__) && !defined (__x86_64__)
bf0270
   grub_size_t tramp;
bf0270
   grub_size_t got;
bf0270
@@ -286,16 +286,24 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
bf0270
 #endif
bf0270
   char *ptr;
bf0270
 
bf0270
+  arch_addralign = grub_arch_dl_min_alignment ();
bf0270
+
bf0270
   for (i = 0, s = (const Elf_Shdr *)((const char *) e + e->e_shoff);
bf0270
        i < e->e_shnum;
bf0270
        i++, s = (const Elf_Shdr *)((const char *) s + e->e_shentsize))
bf0270
     {
bf0270
+      grub_size_t sh_addralign;
bf0270
+      grub_size_t sh_size;
bf0270
+
bf0270
       if (s->sh_size == 0 || !(s->sh_flags & SHF_ALLOC))
bf0270
 	continue;
bf0270
 
bf0270
-      tsize = ALIGN_UP (tsize, s->sh_addralign) + s->sh_size;
bf0270
-      if (talign < s->sh_addralign)
bf0270
-	talign = s->sh_addralign;
bf0270
+      sh_addralign = ALIGN_UP(s->sh_addralign, arch_addralign);
bf0270
+      sh_size = ALIGN_UP(s->sh_size, sh_addralign);
bf0270
+
bf0270
+      tsize = ALIGN_UP (tsize, sh_addralign) + sh_size;
bf0270
+      if (talign < sh_addralign)
bf0270
+	talign = sh_addralign;
bf0270
     }
bf0270
 
bf0270
 #if !defined (__i386__) && !defined (__x86_64__)
bf0270
@@ -324,6 +332,9 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
bf0270
        i < e->e_shnum;
bf0270
        i++, s = (Elf_Shdr *)((char *) s + e->e_shentsize))
bf0270
     {
bf0270
+      grub_size_t sh_addralign = ALIGN_UP(s->sh_addralign, arch_addralign);
bf0270
+      grub_size_t sh_size = ALIGN_UP(s->sh_size, sh_addralign);
bf0270
+
bf0270
       if (s->sh_flags & SHF_ALLOC)
bf0270
 	{
bf0270
 	  grub_dl_segment_t seg;
bf0270
@@ -336,17 +347,19 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
bf0270
 	    {
bf0270
 	      void *addr;
bf0270
 
bf0270
-	      ptr = (char *) ALIGN_UP ((grub_addr_t) ptr, s->sh_addralign);
bf0270
+	      ptr = (char *) ALIGN_UP ((grub_addr_t) ptr, sh_addralign);
bf0270
 	      addr = ptr;
bf0270
-	      ptr += s->sh_size;
bf0270
+	      ptr += sh_size;
bf0270
 
bf0270
 	      switch (s->sh_type)
bf0270
 		{
bf0270
 		case SHT_PROGBITS:
bf0270
 		  grub_memcpy (addr, (char *) e + s->sh_offset, s->sh_size);
bf0270
+		  grub_memset ((char *)addr + s->sh_size, 0,
bf0270
+			       sh_size - s->sh_size);
bf0270
 		  break;
bf0270
 		case SHT_NOBITS:
bf0270
-		  grub_memset (addr, 0, s->sh_size);
bf0270
+		  grub_memset (addr, 0, sh_size);
bf0270
 		  break;
bf0270
 		}
bf0270
 
bf0270
@@ -355,7 +368,7 @@ grub_dl_load_segments (grub_dl_t mod, const Elf_Ehdr *e)
bf0270
 	  else
bf0270
 	    seg->addr = 0;
bf0270
 
bf0270
-	  seg->size = s->sh_size;
bf0270
+	  seg->size = sh_size;
bf0270
 	  seg->section = i;
bf0270
 	  seg->next = mod->segment;
bf0270
 	  mod->segment = seg;
bf0270
diff --git a/grub-core/kern/emu/full.c b/grub-core/kern/emu/full.c
bf0270
index e8d63b1f5f..1de1c28eb0 100644
bf0270
--- a/grub-core/kern/emu/full.c
bf0270
+++ b/grub-core/kern/emu/full.c
bf0270
@@ -67,3 +67,16 @@ grub_arch_dl_init_linker (void)
bf0270
 }
bf0270
 #endif
bf0270
 
bf0270
+
bf0270
+/*
bf0270
+ * Tell the loader what our minimum section alignment is.
bf0270
+ */
bf0270
+grub_size_t
bf0270
+grub_arch_dl_min_alignment (void)
bf0270
+{
bf0270
+#ifdef GRUB_MACHINE_EFI
bf0270
+  return 4096;
bf0270
+#else
bf0270
+  return 1;
bf0270
+#endif
bf0270
+}
bf0270
diff --git a/grub-core/kern/i386/dl.c b/grub-core/kern/i386/dl.c
bf0270
index 1346da5cc9..d6b4681fc9 100644
bf0270
--- a/grub-core/kern/i386/dl.c
bf0270
+++ b/grub-core/kern/i386/dl.c
bf0270
@@ -79,3 +79,16 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
bf0270
 
bf0270
   return GRUB_ERR_NONE;
bf0270
 }
bf0270
+
bf0270
+/*
bf0270
+ * Tell the loader what our minimum section alignment is.
bf0270
+ */
bf0270
+grub_size_t
bf0270
+grub_arch_dl_min_alignment (void)
bf0270
+{
bf0270
+#ifdef GRUB_MACHINE_EFI
bf0270
+  return 4096;
bf0270
+#else
bf0270
+  return 1;
bf0270
+#endif
bf0270
+}
bf0270
diff --git a/grub-core/kern/ia64/dl.c b/grub-core/kern/ia64/dl.c
bf0270
index ebcf316298..3bb753a89b 100644
bf0270
--- a/grub-core/kern/ia64/dl.c
bf0270
+++ b/grub-core/kern/ia64/dl.c
bf0270
@@ -143,3 +143,12 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
bf0270
     }
bf0270
   return GRUB_ERR_NONE;
bf0270
 }
bf0270
+
bf0270
+/*
bf0270
+ * Tell the loader what our minimum section alignment is.
bf0270
+ */
bf0270
+grub_size_t
bf0270
+grub_arch_dl_min_alignment (void)
bf0270
+{
bf0270
+  return 1;
bf0270
+}
bf0270
diff --git a/grub-core/kern/mips/dl.c b/grub-core/kern/mips/dl.c
bf0270
index 5d7d299c74..6d83bd71e9 100644
bf0270
--- a/grub-core/kern/mips/dl.c
bf0270
+++ b/grub-core/kern/mips/dl.c
bf0270
@@ -272,3 +272,11 @@ grub_arch_dl_init_linker (void)
bf0270
   grub_dl_register_symbol ("_gp_disp", &_gp_disp_dummy, 0, 0);
bf0270
 }
bf0270
 
bf0270
+/*
bf0270
+ * Tell the loader what our minimum section alignment is.
bf0270
+ */
bf0270
+grub_size_t
bf0270
+grub_arch_dl_min_alignment (void)
bf0270
+{
bf0270
+  return 1;
bf0270
+}
bf0270
diff --git a/grub-core/kern/powerpc/dl.c b/grub-core/kern/powerpc/dl.c
bf0270
index 3a7fa3ed3d..577e27d871 100644
bf0270
--- a/grub-core/kern/powerpc/dl.c
bf0270
+++ b/grub-core/kern/powerpc/dl.c
bf0270
@@ -165,3 +165,12 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
bf0270
 
bf0270
   return GRUB_ERR_NONE;
bf0270
 }
bf0270
+
bf0270
+/*
bf0270
+ * Tell the loader what our minimum section alignment is.
bf0270
+ */
bf0270
+grub_size_t
bf0270
+grub_arch_dl_min_alignment (void)
bf0270
+{
bf0270
+  return 1;
bf0270
+}
bf0270
diff --git a/grub-core/kern/sparc64/dl.c b/grub-core/kern/sparc64/dl.c
bf0270
index 739be47174..c741c1782e 100644
bf0270
--- a/grub-core/kern/sparc64/dl.c
bf0270
+++ b/grub-core/kern/sparc64/dl.c
bf0270
@@ -184,3 +184,12 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
bf0270
 
bf0270
   return GRUB_ERR_NONE;
bf0270
 }
bf0270
+
bf0270
+/*
bf0270
+ * Tell the loader what our minimum section alignment is.
bf0270
+ */
bf0270
+grub_size_t
bf0270
+grub_arch_dl_min_alignment (void)
bf0270
+{
bf0270
+  return 1;
bf0270
+}
bf0270
diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
bf0270
index 3a73e6e6ce..6c20b7c367 100644
bf0270
--- a/grub-core/kern/x86_64/dl.c
bf0270
+++ b/grub-core/kern/x86_64/dl.c
bf0270
@@ -114,3 +114,16 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
bf0270
 
bf0270
   return GRUB_ERR_NONE;
bf0270
 }
bf0270
+
bf0270
+/*
bf0270
+ * Tell the loader what our minimum section alignment is.
bf0270
+ */
bf0270
+grub_size_t
bf0270
+grub_arch_dl_min_alignment (void)
bf0270
+{
bf0270
+#ifdef GRUB_MACHINE_EFI
bf0270
+  return 4096;
bf0270
+#else
bf0270
+  return 1;
bf0270
+#endif
bf0270
+}
bf0270
diff --git a/include/grub/dl.h b/include/grub/dl.h
bf0270
index 9ec6caf3f9..dd4c3e7ff4 100644
bf0270
--- a/include/grub/dl.h
bf0270
+++ b/include/grub/dl.h
bf0270
@@ -280,6 +280,8 @@ grub_err_t grub_arch_dl_check_header (void *ehdr);
bf0270
 grub_err_t
bf0270
 grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
bf0270
 			       Elf_Shdr *s, grub_dl_segment_t seg);
bf0270
+grub_size_t
bf0270
+grub_arch_dl_min_alignment (void);
bf0270
 #endif
bf0270
 
bf0270
 #if defined (_mips)
bf0270
diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
bf0270
index 03d53498c5..dbfb94bc06 100644
bf0270
--- a/docs/grub-dev.texi
bf0270
+++ b/docs/grub-dev.texi
bf0270
@@ -638,9 +638,9 @@ declare startup asm file ($cpu_$platform_startup) as well as any other files
bf0270
 (e.g. init.c and callwrap.S) (e.g. $cpu_$platform = kern/$cpu/$platform/init.c).
bf0270
 At this stage you will also need to add dummy dl.c and cache.S with functions
bf0270
 grub_err_t grub_arch_dl_check_header (void *ehdr), grub_err_t
bf0270
-grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr) (dl.c) and
bf0270
-void grub_arch_sync_caches (void *address, grub_size_t len) (cache.S). They
bf0270
-won't be used for now.
bf0270
+grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr) (dl.c), grub_uint32_t
bf0270
+grub_arch_dl_min_alignment (void), and void grub_arch_sync_caches (void
bf0270
+*address, grub_size_t len) (cache.S). They won't be used for now.
bf0270
 
bf0270
 You will need to create directory include/$cpu/$platform and a file
bf0270
 include/$cpu/types.h. The later folowing this template: