58fe9a
From 15a559aa62cba70b714c066b1075bacfa72cb180 Mon Sep 17 00:00:00 2001
4dcaf2
From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
4dcaf2
Date: Fri, 15 Aug 2014 14:39:53 -0300
58fe9a
Subject: [PATCH 143/152] Suport for bi-endianess in elf file
4dcaf2
4dcaf2
* grub-core/kern/elf.c: check and switch endianess with grub_{be,le}_to
4dcaf2
  cpu functions.
4dcaf2
* grub-core/kern/elfXX.c: Likewise.
4dcaf2
4dcaf2
Also-by: Tomohiro B Berry <tbberry@us.ibm.com>
4dcaf2
---
4dcaf2
 grub-core/kern/elf.c   | 60 +++++++++++++++++++++++++++++++++++++++--
4dcaf2
 grub-core/kern/elfXX.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++
4dcaf2
 2 files changed, 131 insertions(+), 2 deletions(-)
4dcaf2
4dcaf2
diff --git a/grub-core/kern/elf.c b/grub-core/kern/elf.c
4dcaf2
index 5f99c43..de90811 100644
4dcaf2
--- a/grub-core/kern/elf.c
4dcaf2
+++ b/grub-core/kern/elf.c
4dcaf2
@@ -28,6 +28,11 @@
4dcaf2
 
4dcaf2
 GRUB_MOD_LICENSE ("GPLv3+");
4dcaf2
 
4dcaf2
+void grub_elf32_check_endianess (grub_elf_t elf);
4dcaf2
+void grub_elf64_check_endianess (grub_elf_t elf);
4dcaf2
+grub_err_t grub_elf32_check_version (grub_elf_t elf);
4dcaf2
+grub_err_t grub_elf64_check_version (grub_elf_t elf);
4dcaf2
+
4dcaf2
 /* Check if EHDR is a valid ELF header.  */
4dcaf2
 static grub_err_t
4dcaf2
 grub_elf_check_header (grub_elf_t elf)
4dcaf2
@@ -38,10 +43,22 @@ grub_elf_check_header (grub_elf_t elf)
4dcaf2
       || e->e_ident[EI_MAG1] != ELFMAG1
4dcaf2
       || e->e_ident[EI_MAG2] != ELFMAG2
4dcaf2
       || e->e_ident[EI_MAG3] != ELFMAG3
4dcaf2
-      || e->e_ident[EI_VERSION] != EV_CURRENT
4dcaf2
-      || e->e_version != EV_CURRENT)
4dcaf2
+      || e->e_ident[EI_VERSION] != EV_CURRENT)
4dcaf2
     return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-independent ELF magic"));
4dcaf2
 
4dcaf2
+  if (grub_elf_is_elf32 (elf))
4dcaf2
+    {
4dcaf2
+      grub_elf32_check_endianess (elf);
4dcaf2
+      grub_elf32_check_version (elf);
4dcaf2
+    }
4dcaf2
+  else if (grub_elf_is_elf64 (elf))
4dcaf2
+    {
4dcaf2
+      grub_elf64_check_endianess (elf);
4dcaf2
+      grub_elf64_check_version (elf);
4dcaf2
+    }
4dcaf2
+  else
4dcaf2
+    return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-dependent ELF magic"));
4dcaf2
+
4dcaf2
   return GRUB_ERR_NONE;
4dcaf2
 }
4dcaf2
 
4dcaf2
@@ -127,7 +144,20 @@ grub_elf_open (const char *name)
4dcaf2
 #define grub_elf_is_elfXX grub_elf_is_elf32
4dcaf2
 #define grub_elfXX_load_phdrs grub_elf32_load_phdrs
4dcaf2
 #define ElfXX_Phdr Elf32_Phdr
4dcaf2
+#define ElfXX_Ehdr Elf32_Ehdr
4dcaf2
 #define grub_uintXX_t grub_uint32_t
4dcaf2
+#define grub_be_to_halfXX grub_be_to_cpu16
4dcaf2
+#define grub_be_to_wordXX grub_be_to_cpu32
4dcaf2
+#define grub_be_to_addrXX grub_be_to_cpu32
4dcaf2
+#define grub_be_to_offXX grub_be_to_cpu32
4dcaf2
+#define grub_be_to_XwordXX grub_be_to_wordXX
4dcaf2
+#define grub_le_to_halfXX grub_le_to_cpu16
4dcaf2
+#define grub_le_to_wordXX grub_le_to_cpu32
4dcaf2
+#define grub_le_to_addrXX grub_le_to_cpu32
4dcaf2
+#define grub_le_to_offXX grub_le_to_cpu32
4dcaf2
+#define grub_le_to_XwordXX grub_le_to_wordXX
4dcaf2
+#define grub_elfXX_check_endianess grub_elf32_check_endianess
4dcaf2
+#define grub_elfXX_check_version grub_elf32_check_version
4dcaf2
 
4dcaf2
 #include "elfXX.c"
4dcaf2
 
4dcaf2
@@ -140,7 +170,20 @@ grub_elf_open (const char *name)
4dcaf2
 #undef grub_elf_is_elfXX
4dcaf2
 #undef grub_elfXX_load_phdrs
4dcaf2
 #undef ElfXX_Phdr
4dcaf2
+#undef ElfXX_Ehdr
4dcaf2
 #undef grub_uintXX_t
4dcaf2
+#undef grub_be_to_halfXX
4dcaf2
+#undef grub_be_to_wordXX
4dcaf2
+#undef grub_be_to_addrXX
4dcaf2
+#undef grub_be_to_offXX
4dcaf2
+#undef grub_be_to_XwordXX
4dcaf2
+#undef grub_le_to_halfXX
4dcaf2
+#undef grub_le_to_wordXX
4dcaf2
+#undef grub_le_to_addrXX
4dcaf2
+#undef grub_le_to_offXX
4dcaf2
+#undef grub_le_to_XwordXX
4dcaf2
+#undef grub_elfXX_check_endianess
4dcaf2
+#undef grub_elfXX_check_version
4dcaf2
 
4dcaf2
 
4dcaf2
 /* 64-bit */
4dcaf2
@@ -153,6 +196,19 @@ grub_elf_open (const char *name)
4dcaf2
 #define grub_elf_is_elfXX grub_elf_is_elf64
4dcaf2
 #define grub_elfXX_load_phdrs grub_elf64_load_phdrs
4dcaf2
 #define ElfXX_Phdr Elf64_Phdr
4dcaf2
+#define ElfXX_Ehdr Elf64_Ehdr
4dcaf2
 #define grub_uintXX_t grub_uint64_t
4dcaf2
+#define grub_be_to_halfXX grub_be_to_cpu16
4dcaf2
+#define grub_be_to_wordXX grub_be_to_cpu32
4dcaf2
+#define grub_be_to_addrXX grub_be_to_cpu64
4dcaf2
+#define grub_be_to_offXX grub_be_to_cpu64
4dcaf2
+#define grub_be_to_XwordXX grub_be_to_cpu64
4dcaf2
+#define grub_le_to_halfXX grub_le_to_cpu16
4dcaf2
+#define grub_le_to_wordXX grub_le_to_cpu32
4dcaf2
+#define grub_le_to_addrXX grub_le_to_cpu64
4dcaf2
+#define grub_le_to_offXX grub_le_to_cpu64
4dcaf2
+#define grub_le_to_XwordXX grub_le_to_cpu64
4dcaf2
+#define grub_elfXX_check_endianess grub_elf64_check_endianess
4dcaf2
+#define grub_elfXX_check_version grub_elf64_check_version
4dcaf2
 
4dcaf2
 #include "elfXX.c"
4dcaf2
diff --git a/grub-core/kern/elfXX.c b/grub-core/kern/elfXX.c
4dcaf2
index 1d09971..ecf9df6 100644
4dcaf2
--- a/grub-core/kern/elfXX.c
4dcaf2
+++ b/grub-core/kern/elfXX.c
4dcaf2
@@ -154,3 +154,76 @@ grub_elfXX_load (grub_elf_t elf, const char *filename,
4dcaf2
 
4dcaf2
   return grub_errno;
4dcaf2
 }
4dcaf2
+
4dcaf2
+void
4dcaf2
+grub_elfXX_check_endianess (grub_elf_t elf)
4dcaf2
+{
4dcaf2
+  ElfXX_Ehdr *e = &(elf->ehdr.ehdrXX);
4dcaf2
+  ElfXX_Phdr *phdr;
4dcaf2
+
4dcaf2
+  if (e->e_ident[EI_DATA] == ELFDATA2MSB)
4dcaf2
+    {
4dcaf2
+      e->e_type = grub_be_to_halfXX (e->e_type);
4dcaf2
+      e->e_machine = grub_be_to_halfXX (e->e_machine);
4dcaf2
+      e->e_version = grub_be_to_wordXX (e->e_version);
4dcaf2
+      e->e_entry = grub_be_to_addrXX (e->e_entry);
4dcaf2
+      e->e_phoff = grub_be_to_offXX (e->e_phoff);
4dcaf2
+      e->e_shoff = grub_be_to_offXX (e->e_shoff);
4dcaf2
+      e->e_flags = grub_be_to_wordXX (e->e_flags);
4dcaf2
+      e->e_ehsize = grub_be_to_halfXX (e->e_ehsize);
4dcaf2
+      e->e_phentsize = grub_be_to_halfXX (e->e_phentsize);
4dcaf2
+      e->e_phnum = grub_be_to_halfXX (e->e_phnum);
4dcaf2
+      e->e_shentsize = grub_be_to_halfXX (e->e_shentsize);
4dcaf2
+      e->e_shnum = grub_be_to_halfXX (e->e_shnum);
4dcaf2
+      e->e_shstrndx = grub_be_to_halfXX (e->e_shstrndx);
4dcaf2
+
4dcaf2
+      FOR_ELFXX_PHDRS (elf,phdr)
4dcaf2
+        {
4dcaf2
+          phdr->p_type = grub_be_to_wordXX (phdr->p_type);
4dcaf2
+          phdr->p_flags = grub_be_to_wordXX (phdr->p_flags);
4dcaf2
+          phdr->p_offset = grub_be_to_offXX (phdr->p_offset);
4dcaf2
+          phdr->p_vaddr = grub_be_to_addrXX (phdr->p_vaddr);
4dcaf2
+          phdr->p_paddr = grub_be_to_addrXX (phdr->p_paddr);
4dcaf2
+          phdr->p_filesz = grub_be_to_XwordXX (phdr->p_filesz);
4dcaf2
+          phdr->p_memsz = grub_be_to_XwordXX (phdr->p_memsz);
4dcaf2
+          phdr->p_align = grub_be_to_XwordXX (phdr->p_align);
4dcaf2
+        }
4dcaf2
+    }
4dcaf2
+  else if (e->e_ident[EI_DATA] == ELFDATA2LSB)
4dcaf2
+    {
4dcaf2
+      e->e_type = grub_le_to_halfXX (e->e_type);
4dcaf2
+      e->e_machine = grub_le_to_halfXX (e->e_machine);
4dcaf2
+      e->e_version = grub_le_to_wordXX (e->e_version);
4dcaf2
+      e->e_entry = grub_le_to_addrXX (e->e_entry);
4dcaf2
+      e->e_phoff = grub_le_to_offXX (e->e_phoff);
4dcaf2
+      e->e_shoff = grub_le_to_offXX (e->e_shoff);
4dcaf2
+      e->e_flags = grub_le_to_wordXX (e->e_flags);
4dcaf2
+      e->e_ehsize = grub_le_to_halfXX (e->e_ehsize);
4dcaf2
+      e->e_phentsize = grub_le_to_halfXX (e->e_phentsize);
4dcaf2
+      e->e_phnum = grub_le_to_halfXX (e->e_phnum);
4dcaf2
+      e->e_shentsize = grub_le_to_halfXX (e->e_shentsize);
4dcaf2
+      e->e_shnum = grub_le_to_halfXX (e->e_shnum);
4dcaf2
+      e->e_shstrndx = grub_le_to_halfXX (e->e_shstrndx);
4dcaf2
+
4dcaf2
+      FOR_ELFXX_PHDRS (elf,phdr)
4dcaf2
+        {
4dcaf2
+          phdr->p_type = grub_le_to_wordXX (phdr->p_type);
4dcaf2
+          phdr->p_flags = grub_le_to_wordXX (phdr->p_flags);
4dcaf2
+          phdr->p_offset = grub_le_to_offXX (phdr->p_offset);
4dcaf2
+          phdr->p_vaddr = grub_le_to_addrXX (phdr->p_vaddr);
4dcaf2
+          phdr->p_paddr = grub_le_to_addrXX (phdr->p_paddr);
4dcaf2
+          phdr->p_filesz = grub_le_to_XwordXX (phdr->p_filesz);
4dcaf2
+          phdr->p_memsz = grub_le_to_XwordXX (phdr->p_memsz);
4dcaf2
+          phdr->p_align = grub_le_to_XwordXX (phdr->p_align);
4dcaf2
+        }
4dcaf2
+    }
4dcaf2
+}
4dcaf2
+
4dcaf2
+grub_err_t
4dcaf2
+grub_elfXX_check_version (grub_elf_t elf)
4dcaf2
+{
4dcaf2
+  if (elf->ehdr.ehdrXX.e_version != EV_CURRENT)
4dcaf2
+    return grub_error (GRUB_ERR_BAD_OS, N_("invalid arch-independent ELF magic"));
4dcaf2
+
4dcaf2
+  return GRUB_ERR_NONE;
4dcaf2
+}
4dcaf2
-- 
4dcaf2
1.9.3
4dcaf2