david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Use generic "struct image" rather than "struct elf".

This commit is contained in:
Michael Brown 2007-01-11 16:10:32 +00:00
parent c6c63d954d
commit c810baad37
3 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/image/elf.c
View File

@ -27,6 +27,7 @@
#include <elf.h> #include <elf.h>
#include <gpxe/uaccess.h> #include <gpxe/uaccess.h>
#include <gpxe/segment.h> #include <gpxe/segment.h>
#include <gpxe/image.h>
#include <gpxe/elf.h> #include <gpxe/elf.h>
typedef Elf32_Ehdr Elf_Ehdr; typedef Elf32_Ehdr Elf_Ehdr;
@ -36,11 +37,11 @@ typedef Elf32_Off Elf_Off;
/** /**
* Load ELF segment into memory * Load ELF segment into memory
* *
* @v elf ELF file * @v image ELF file
* @v phdr ELF program header * @v phdr ELF program header
* @ret rc Return status code * @ret rc Return status code
*/ */
static int elf_load_segment ( struct elf *elf, Elf_Phdr *phdr ) { static int elf_load_segment ( struct image *image, Elf_Phdr *phdr ) {
physaddr_t dest; physaddr_t dest;
userptr_t buffer; userptr_t buffer;
int rc; int rc;
@ -50,7 +51,7 @@ static int elf_load_segment ( struct elf *elf, Elf_Phdr *phdr ) {
return 0; return 0;
/* Check segment lies within image */ /* Check segment lies within image */
if ( ( phdr->p_offset + phdr->p_filesz ) > elf->len ) { if ( ( phdr->p_offset + phdr->p_filesz ) > image->len ) {
DBG ( "ELF segment outside ELF file\n" ); DBG ( "ELF segment outside ELF file\n" );
return -ENOEXEC; return -ENOEXEC;
} }
@ -81,7 +82,7 @@ static int elf_load_segment ( struct elf *elf, Elf_Phdr *phdr ) {
} }
/* Copy image to segment */ /* Copy image to segment */
copy_user ( buffer, 0, elf->image, phdr->p_offset, phdr->p_filesz ); copy_user ( buffer, 0, image->data, phdr->p_offset, phdr->p_filesz );
return 0; return 0;
} }
@ -89,10 +90,10 @@ static int elf_load_segment ( struct elf *elf, Elf_Phdr *phdr ) {
/** /**
* Load ELF image into memory * Load ELF image into memory
* *
* @v elf ELF file * @v image ELF file
* @ret rc Return status code * @ret rc Return status code
*/ */
int elf_load ( struct elf *elf ) { int elf_load ( struct image *image ) {
Elf_Ehdr ehdr; Elf_Ehdr ehdr;
Elf_Phdr phdr; Elf_Phdr phdr;
Elf_Off phoff; Elf_Off phoff;
@ -100,7 +101,7 @@ int elf_load ( struct elf *elf ) {
int rc; int rc;
/* Read ELF header */ /* Read ELF header */
copy_from_user ( &ehdr, elf->image, 0, sizeof ( ehdr ) ); copy_from_user ( &ehdr, image->data, 0, sizeof ( ehdr ) );
if ( memcmp ( &ehdr.e_ident[EI_MAG0], ELFMAG, SELFMAG ) != 0 ) { if ( memcmp ( &ehdr.e_ident[EI_MAG0], ELFMAG, SELFMAG ) != 0 ) {
DBG ( "Invalid ELF signature\n" ); DBG ( "Invalid ELF signature\n" );
return -ENOEXEC; return -ENOEXEC;
@ -109,18 +110,24 @@ int elf_load ( struct elf *elf ) {
/* Read ELF program headers */ /* Read ELF program headers */
for ( phoff = ehdr.e_phoff , phnum = ehdr.e_phnum ; phnum ; for ( phoff = ehdr.e_phoff , phnum = ehdr.e_phnum ; phnum ;
phoff += ehdr.e_phentsize, phnum-- ) { phoff += ehdr.e_phentsize, phnum-- ) {
if ( phoff > elf->len ) { if ( phoff > image->len ) {
DBG ( "ELF program header %d outside ELF image\n", DBG ( "ELF program header %d outside ELF image\n",
phnum ); phnum );
return -ENOEXEC; return -ENOEXEC;
} }
copy_from_user ( &phdr, elf->image, phoff, sizeof ( phdr ) ); copy_from_user ( &phdr, image->data, phoff, sizeof ( phdr ) );
if ( ( rc = elf_load_segment ( elf, &phdr ) ) != 0 ) if ( ( rc = elf_load_segment ( image, &phdr ) ) != 0 )
return rc; return rc;
} }
/* Fill in entry point address */ /* Fill in entry point address */
elf->entry = ehdr.e_entry; image->entry = ehdr.e_entry;
return 0; return 0;
} }
/** ELF image type */
struct image_type elf_image_type __image_type = {
.name = "ELF",
.load = elf_load,
};

13
src/include/gpxe/elf.h
View File

@ -10,17 +10,6 @@
#include <elf.h> #include <elf.h>
/** An ELF file */ extern int elf_load ( struct image *image );
struct elf {
/** ELF file image */
userptr_t image;
/** Length of ELF file image */
size_t len;
/** Entry point */
physaddr_t entry;
};
extern int elf_load ( struct elf *elf );
#endif /* _GPXE_ELF_H */ #endif /* _GPXE_ELF_H */

11
src/tests/tftptest.c
View File

@ -6,6 +6,7 @@
#include <gpxe/async.h> #include <gpxe/async.h>
#include <gpxe/uaccess.h> #include <gpxe/uaccess.h>
#include <gpxe/buffer.h> #include <gpxe/buffer.h>
#include <gpxe/image.h>
#include <gpxe/elf.h> #include <gpxe/elf.h>
#include <bios.h> #include <bios.h>
#include "pxe.h" #include "pxe.h"
@ -14,7 +15,7 @@ int test_tftp ( struct net_device *netdev, struct sockaddr_tcpip *target,
const char *filename ) { const char *filename ) {
struct tftp_session tftp; struct tftp_session tftp;
struct buffer buffer; struct buffer buffer;
struct elf elf; struct image image;
uint16_t fbms; uint16_t fbms;
int rc; int rc;
@ -32,11 +33,11 @@ int test_tftp ( struct net_device *netdev, struct sockaddr_tcpip *target,
if ( ( rc = async_wait ( tftp_get ( &tftp ) ) ) != 0 ) if ( ( rc = async_wait ( tftp_get ( &tftp ) ) ) != 0 )
return rc; return rc;
elf.image = buffer.addr; image.data = buffer.addr;
elf.len = buffer.len; image.len = buffer.len;
if ( ( rc = elf_load ( &elf ) ) == 0 ) { if ( ( rc = elf_load ( &image ) ) == 0 ) {
printf ( "Got valid ELF image: execaddr at %lx\n", printf ( "Got valid ELF image: execaddr at %lx\n",
elf.entry ); image.entry );
return 0; return 0;
} }