Changeset aa865ee in mainline

Timestamp:

2011-07-25T21:18:48Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3fb0fec, ceb890b

Parents:

c566782

Message:

Check against end of file when reading ELF.

File:

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

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

@@ -148 +148 @@
 
         rc = read_all(elf->fd, header, sizeof(elf_header_t));
-        if (rc < 0) {
+        if (rc != sizeof(elf_header_t)) {
                 DPRINTF("Read error.\n"); 
                 return EE_INVALID;
@@ -211 +211 @@
                 rc = read_all(elf->fd, &segment_hdr,
                     sizeof(elf_segment_header_t));
-                if (rc < 0) {
+                if (rc != sizeof(elf_segment_header_t)) {
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -233 +233 @@
                 rc = read_all(elf->fd, &section_hdr,
                     sizeof(elf_section_header_t));
-                if (rc < 0) {
+                if (rc != sizeof(elf_section_header_t)) {
                         DPRINTF("Read error.\n");
                         return EE_INVALID;
@@ -321 +321 @@
         uintptr_t seg_addr;
         size_t mem_sz;
-        int rc;
+        ssize_t rc;
 
         bias = elf->bias;
@@ -401 +401 @@
                 rc = read_all(elf->fd, dp, now);
 
-                if (rc < 0) { 
+                if (rc != (ssize_t) now) { 
                         DPRINTF("Read error.\n");
                         return EE_INVALID;