Changeset 1afa94d in mainline

Timestamp:

2017-12-10T21:08:11Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dd8ab1c

Parents:

c81132d

Message:

Fix error handling in elf code.

Location:

uspace/lib/c

Files:

• generic/elf/elf_load.c (modified) (1 diff)
• generic/elf/elf_mod.c (modified) (9 diffs)
• include/elf/elf_mod.h (modified) (1 diff)

uspace/lib/c/generic/elf/elf_load.c

@@ -53 +53 @@
  * @param file File handle 
  * @param info Place to store ELF program information
- * @return EOK on success or an error code
+ * @return EE_OK on success or an EE_x error code
  */
 int elf_load(int file, elf_info_t *info)

uspace/lib/c/generic/elf/elf_mod.c

@@ -69 +69 @@
         "incompatible image",
         "unsupported image type",
-        "irrecoverable error"
+        "irrecoverable error",
+        "file io error"
 };
 
@@ -90 +91 @@
  *                  extracted from the binary.
  *
- * @return EOK on success or negative error code.
+ * @return EE_OK on success or EE_xx error code.
  *
  */
@@ -103 +104 @@
         }
         if (rc != EOK) {
-                return rc;
+                return EE_IO;
         }
 
@@ -110 +111 @@
         elf.flags = flags;
 
-        rc = elf_load_module(&elf, so_bias);
+        int ret = elf_load_module(&elf, so_bias);
 
         vfs_put(ofile);
-        return rc;
+        return ret;
 }
 
@@ -122 +123 @@
         int rc = vfs_lookup(path, 0, &file);
         if (rc == EOK) {
-                rc = elf_load_file(file, so_bias, flags, info);
+                int ret = elf_load_file(file, so_bias, flags, info);
                 vfs_put(file);
-        }
-        return rc;
+                return ret;
+        } else {
+                return EE_IO;
+        }
 }
 
@@ -144 +147 @@
         aoff64_t pos = 0;
         size_t nr;
-        int i, rc;
+        int i, ret;
+        int rc;
 
         rc = vfs_read(elf->fd, &pos, header, sizeof(elf_header_t), &nr);
         if (rc != EOK || nr != sizeof(elf_header_t)) {
                 DPRINTF("Read error.\n"); 
-                return EE_INVALID;
+                return EE_IO;
         }
 
@@ -209 +213 @@
                 if (rc != EOK || nr != sizeof(elf_segment_header_t)) {
                         DPRINTF("Read error.\n");
-                        return EE_INVALID;
+                        return EE_IO;
                 }
 
-                rc = segment_header(elf, &segment_hdr);
-                if (rc != EE_OK)
-                        return rc;
+                ret = segment_header(elf, &segment_hdr);
+                if (ret != EE_OK)
+                        return ret;
         }
 
@@ -228 +232 @@
                 if (rc != EOK || nr != sizeof(elf_section_header_t)) {
                         DPRINTF("Read error.\n");
-                        return EE_INVALID;
+                        return EE_IO;
                 }
 
-                rc = section_header(elf, &section_hdr);
-                if (rc != EE_OK)
-                        return rc;
+                ret = section_header(elf, &section_hdr);
+                if (ret != EE_OK)
+                        return ret;
         }
 
@@ -399 +403 @@
         if (rc != EOK || nr != entry->p_filesz) {
                 DPRINTF("read error\n");
-                return EE_INVALID;
+                return EE_IO;
         }
 

uspace/lib/c/include/elf/elf_mod.h

@@ -53 +53 @@
 #define EE_LOADER               5       /* The image is actually a program loader. */
 #define EE_IRRECOVERABLE        6
+#define EE_IO                   7       /* Could not read file. */
 
 typedef enum {