Limit -ENOEXEC to mean "this is not in my format".

diff --git a/src/image/elf.c b/src/image/elf.c
index 5233a64c4e8fa52ed7b354016c171189104e9223..cf58a5c33b2194a3a790076ee54da1c6595fff8d 100644 (file)
--- a/src/image/elf.c
+++ b/src/image/elf.c
@@ -53,7 +53,7 @@ static int elf_load_segment ( struct image *image, Elf_Phdr *phdr ) {
        /* Check segment lies within image */
        if ( ( phdr->p_offset + phdr->p_filesz ) > image->len ) {
                DBG ( "ELF segment outside ELF file\n" );
-               return -ENOEXEC;
+               return -ERANGE;
        }
 
        /* Find start address: use physical address for preference,
@@ -65,7 +65,7 @@ static int elf_load_segment ( struct image *image, Elf_Phdr *phdr ) {
                dest = phdr->p_vaddr;
        if ( ! dest ) {
                DBG ( "ELF segment loads to physical address 0\n" );
-               return -ENOEXEC;
+               return -ERANGE;
        }
        buffer = phys_to_user ( dest );
 
@@ -113,7 +113,7 @@ int elf_load ( struct image *image ) {
                if ( phoff > image->len ) {
                        DBG ( "ELF program header %d outside ELF image\n",
                              phnum );
-                       return -ENOEXEC;
+                       return -ERANGE;
                }
                copy_from_user ( &phdr, image->data, phoff, sizeof ( phdr ) );
                if ( ( rc = elf_load_segment ( image, &phdr ) ) != 0 )

diff --git a/src/include/gpxe/image.h b/src/include/gpxe/image.h
index 6bb6b01248d1d016e3856115b239c034bf1cf747..22f8939f1e4a1daf9389a41636670707a9d9071d 100644 (file)
--- a/src/include/gpxe/image.h
+++ b/src/include/gpxe/image.h
@@ -40,6 +40,14 @@ struct image_type {
         * discarded after this call; the method must preserve any
         * information it may require later (e.g. the execution
         * address) within the @c image structure.
+        *
+        * The method should return -ENOEXEC if and only if the image
+        * is not in the correct format.  Other errors will be
+        * interpreted as "I claim this image format, but there's
+        * something wrong with it that makes it unloadable".  In
+        * particular, returning -ENOEXEC will cause the image probing
+        * code to try the next available image type, while returning
+        * any other error will terminate image probing.
         */
        int ( * load ) ( struct image *image );
 };