grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: ELF bugfixes


From: phcoder
Subject: Re: ELF bugfixes
Date: Fri, 13 Mar 2009 21:52:39 +0100
User-agent: Thunderbird 2.0.0.19 (X11/20090105)

David Miller wrote:
From: phcoder <address@hidden>
Date: Fri, 13 Mar 2009 21:41:42 +0100

Actually our segment table is also our table for transforming
between virtual and physical address. I don't see why entry point
would be defined against virtual address of lowest physical segement

I would suggest simply looping over the phdrs and remembering
which one the e_entry falls into.

Won't that make things work in the case you're describing?

I thought I have attached new patch. Sorry forgot to do so

--

Regards
Vladimir 'phcoder' Serbinenko

Index: ChangeLog
===================================================================
--- ChangeLog   (revision 2036)
+++ ChangeLog   (working copy)
@@ -1,3 +1,11 @@
+2009-03-01  Vladimir Serbinenko  <address@hidden>
+
+       Bugfixes in multiboot for bugs uncovered by solaris kernel
+
+       * loader/i386/multiboot_elfxx.c (grub_multiboot_load_elf): corrected 
+       limit detection
+       Use vaddr of correct segment for entry_point 
+
 2009-03-12  Vladimir Serbinenko  <address@hidden>
 
        Parttool
Index: loader/i386/multiboot_elfxx.c
===================================================================
--- loader/i386/multiboot_elfxx.c       (revision 2036)
+++ loader/i386/multiboot_elfxx.c       (working copy)
@@ -49,7 +49,7 @@
 {
   Elf_Ehdr *ehdr = (Elf_Ehdr *) buffer;
   char *phdr_base;
-  int lowest_segment = 0, highest_segment = 0;
+  int lowest_segment = -1, highest_segment = -1;
   int i;
 
   if (ehdr->e_ident[EI_CLASS] != ELFCLASSXX)
@@ -83,11 +83,17 @@
   for (i = 0; i < ehdr->e_phnum; i++)
     if (phdr(i)->p_type == PT_LOAD && phdr(i)->p_filesz != 0)
       {
-       if (phdr(i)->p_paddr < phdr(lowest_segment)->p_paddr)
+       if (lowest_segment == -1 
+           || phdr(i)->p_paddr < phdr(lowest_segment)->p_paddr)
          lowest_segment = i;
-       if (phdr(i)->p_paddr > phdr(highest_segment)->p_paddr)
+       if (highest_segment == -1
+           || phdr(i)->p_paddr > phdr(highest_segment)->p_paddr)
          highest_segment = i;
       }
+
+  if (lowest_segment == -1)
+    return grub_error (GRUB_ERR_BAD_OS, "ELF contains no loadable segments");
+
   code_size = (phdr(highest_segment)->p_paddr + 
phdr(highest_segment)->p_memsz) - phdr(lowest_segment)->p_paddr;
   grub_multiboot_payload_dest = phdr(lowest_segment)->p_paddr;
 
@@ -105,8 +111,8 @@
         {
          char *load_this_module_at = (char *) (grub_multiboot_payload_orig + 
(long) (phdr(i)->p_paddr - phdr(lowest_segment)->p_paddr));
 
-         grub_dprintf ("multiboot_loader", "segment %d: paddr=0x%lx, 
memsz=0x%lx\n",
-                       i, (long) phdr(i)->p_paddr, (long) phdr(i)->p_memsz);
+         grub_dprintf ("multiboot_loader", "segment %d: paddr=0x%lx, 
memsz=0x%lx, vaddr=0x%lx\n",
+                       i, (long) phdr(i)->p_paddr, (long) phdr(i)->p_memsz, 
(long) phdr(i)->p_vaddr);
 
          if (grub_file_seek (file, (grub_off_t) phdr(i)->p_offset)
              == (grub_off_t) -1)
@@ -124,7 +130,11 @@
         }
     }
 
-  grub_multiboot_payload_entry_offset = ehdr->e_entry - 
phdr(lowest_segment)->p_vaddr;
+  for (i = 0; i < ehdr->e_phnum; i++)
+    if (phdr(i)->p_vaddr <= ehdr->e_entry 
+       && phdr(i)->p_vaddr + phdr(i)->p_memsz > ehdr->e_entry)
+      grub_multiboot_payload_entry_offset = (ehdr->e_entry - phdr(i)->p_vaddr)
+       + (phdr(i)->p_paddr  - phdr(lowest_segment)->p_paddr);
 
 #undef phdr
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]