From e020a35f5b9b59f4017ea994ebff63c3217c9aca Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Wed, 24 Jul 2019 15:18:05 +0000 Subject: [PATCH] Remove a redundant offset computation in elf_load_section(). With r344705 the offset is always zero. Submitted by: Wuyang Chung --- sys/kern/imgact_elf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 3811c203568..07dee10c30e 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -550,7 +550,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 off, map_addr; + vm_offset_t map_addr; int error, rv, cow; size_t copy_len; vm_ooffset_t file_addr; @@ -629,9 +629,8 @@ __elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset, return (EIO); /* send the page fragment to user space */ - off = trunc_page(offset + filsz) - trunc_page(offset + filsz); - error = copyout((caddr_t)sf_buf_kva(sf) + off, - (caddr_t)map_addr, copy_len); + error = copyout((caddr_t)sf_buf_kva(sf), (caddr_t)map_addr, + copy_len); vm_imgact_unmap_page(sf); if (error != 0) return (error);