Changeset 8e3498b in mainline for uspace/lib/c/generic/elf/elf_mod.c

Timestamp:

2017-12-04T18:44:24Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bde5c04

Parents:

40feeac

Message:

vfs_read/write() should return error code separately from number of bytes transferred.

File:

• uspace/lib/c/generic/elf/elf_mod.c (modified) (5 diffs)

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

@@ -137 +137 @@
         elf_header_t *header = &header_buf;
         aoff64_t pos = 0;
+        size_t nr;
         int i, rc;
 
-        rc = vfs_read(elf->fd, &pos, header, sizeof(elf_header_t));
-        if (rc != sizeof(elf_header_t)) {
+        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;
@@ -199 +200 @@
                 pos = header->e_phoff + i * sizeof(elf_segment_header_t);
                 rc = vfs_read(elf->fd, &pos, &segment_hdr,
-                    sizeof(elf_segment_header_t));
-                if (rc != sizeof(elf_segment_header_t)) {
+                    sizeof(elf_segment_header_t), &nr);
+                if (rc != EOK || nr != sizeof(elf_segment_header_t)) {
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -218 +219 @@
                 pos = header->e_shoff + i * sizeof(elf_section_header_t);
                 rc = vfs_read(elf->fd, &pos, &section_hdr,
-                    sizeof(elf_section_header_t));
-                if (rc != sizeof(elf_section_header_t)) {
+                    sizeof(elf_section_header_t), &nr);
+                if (rc != EOK || nr != sizeof(elf_section_header_t)) {
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -330 +331 @@
         size_t mem_sz;
         aoff64_t pos;
-        ssize_t rc;
+        int rc;
+        size_t nr;
 
         bias = elf->bias;
@@ -388 +390 @@
          */
         pos = entry->p_offset;
-        rc = vfs_read(elf->fd, &pos, seg_ptr, entry->p_filesz);
-        if (rc < 0) {
+        rc = vfs_read(elf->fd, &pos, seg_ptr, entry->p_filesz, &nr);
+        if (rc != EOK || nr != entry->p_filesz) {
                 DPRINTF("read error\n");
                 return EE_INVALID;