These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / roms / ipxe / src / arch / i386 / image / elfboot.c

diff --git a/qemu/roms/ipxe/src/arch/i386/image/elfboot.c b/qemu/roms/ipxe/src/arch/i386/image/elfboot.c
index 0f6957f..dc35689 100644 (file)
--- a/qemu/roms/ipxe/src/arch/i386/image/elfboot.c
+++ b/qemu/roms/ipxe/src/arch/i386/image/elfboot.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <errno.h>
 #include <elf.h>
@@ -74,6 +78,27 @@ static int elfboot_exec ( struct image *image ) {
        return -ECANCELED;  /* -EIMPOSSIBLE, anyone? */
 }
 
+/**
+ * Check that ELF segment uses flat physical addressing
+ *
+ * @v image            ELF file
+ * @v phdr             ELF program header
+ * @v dest             Destination address
+ * @ret rc             Return status code
+ */
+static int elfboot_check_segment ( struct image *image, Elf_Phdr *phdr,
+                                  physaddr_t dest ) {
+
+       /* Check that ELF segment uses flat physical addressing */
+       if ( phdr->p_vaddr != dest ) {
+               DBGC ( image, "ELF %p uses virtual addressing (phys %x, "
+                      "virt %x)\n", image, phdr->p_paddr, phdr->p_vaddr );
+               return -ENOEXEC;
+       }
+
+       return 0;
+}
+
 /**
  * Probe ELF image
  *
@@ -91,14 +116,24 @@ static int elfboot_probe ( struct image *image ) {
                [EI_DATA]       = ELFDATA2LSB,
                [EI_VERSION]    = EV_CURRENT,
        };
+       physaddr_t entry;
+       physaddr_t max;
+       int rc;
 
        /* Read ELF header */
        copy_from_user ( &ehdr, image->data, 0, sizeof ( ehdr ) );
        if ( memcmp ( ehdr.e_ident, e_ident, sizeof ( e_ident ) ) != 0 ) {
-               DBG ( "Invalid ELF identifier\n" );
+               DBGC ( image, "Invalid ELF identifier\n" );
                return -ENOEXEC;
        }
 
+       /* Check that this image uses flat physical addressing */
+       if ( ( rc = elf_segments ( image, &ehdr, elfboot_check_segment,
+                                  &entry, &max ) ) != 0 ) {
+               DBGC ( image, "Unloadable ELF image\n" );
+               return rc;
+       }
+
        return 0;
 }