diff options
author | kib <kib@FreeBSD.org> | 2017-03-19 15:44:08 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2017-03-19 15:44:08 +0000 |
commit | 7fd1883417d0602310c2d46796ce4438448ea8a4 (patch) | |
tree | 7116a29c21dbf697cd75dc048e15a5e69ba90800 | |
parent | b4a497ac2d7f1bda2c44199b4ac66998977af29a (diff) | |
download | FreeBSD-src-7fd1883417d0602310c2d46796ce4438448ea8a4.zip FreeBSD-src-7fd1883417d0602310c2d46796ce4438448ea8a4.tar.gz |
MFC r315156:
Style.
-rw-r--r-- | sys/kern/imgact_elf.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 70656ef..36fe4bd 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -508,7 +508,7 @@ __elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset, size_t map_len; vm_map_t map; vm_object_t object; - vm_offset_t map_addr; + vm_offset_t off, map_addr; int error, rv, cow; size_t copy_len; vm_ooffset_t file_addr; @@ -559,9 +559,8 @@ __elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset, return (EINVAL); /* we can stop now if we've covered it all */ - if (memsz == filsz) { + if (memsz == filsz) return (0); - } } @@ -580,14 +579,11 @@ __elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset, if (map_len != 0) { rv = __elfN(map_insert)(imgp, map, NULL, 0, map_addr, map_addr + map_len, VM_PROT_ALL, 0); - if (rv != KERN_SUCCESS) { + if (rv != KERN_SUCCESS) return (EINVAL); - } } if (copy_len != 0) { - vm_offset_t off; - sf = vm_imgact_map_page(object, offset + filsz); if (sf == NULL) return (EIO); @@ -598,14 +594,12 @@ __elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset, error = copyout((caddr_t)sf_buf_kva(sf) + off, (caddr_t)map_addr, copy_len); vm_imgact_unmap_page(sf); - if (error) { + if (error != 0) return (error); - } } /* * set it to the specified protection. - * XXX had better undo the damage from pasting over the cracks here! */ vm_map_protect(map, trunc_page(map_addr), round_page(map_addr + map_len), prot, FALSE); |