[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/48] linux-user/elfload: Fix coding style in load_elf_image
From: |
Peter Maydell |
Subject: |
[PULL 05/48] linux-user/elfload: Fix coding style in load_elf_image |
Date: |
Tue, 27 Oct 2020 11:43:55 +0000 |
From: Richard Henderson <richard.henderson@linaro.org>
Fixing this now will clarify following patches.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20201021173749.111103-6-richard.henderson@linaro.org
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
linux-user/elfload.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 1a3150df7c0..290ef70222b 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2531,9 +2531,15 @@ static void load_elf_image(const char *image_name, int
image_fd,
abi_ulong vaddr, vaddr_po, vaddr_ps, vaddr_ef, vaddr_em, vaddr_len;
int elf_prot = 0;
- if (eppnt->p_flags & PF_R) elf_prot = PROT_READ;
- if (eppnt->p_flags & PF_W) elf_prot |= PROT_WRITE;
- if (eppnt->p_flags & PF_X) elf_prot |= PROT_EXEC;
+ if (eppnt->p_flags & PF_R) {
+ elf_prot |= PROT_READ;
+ }
+ if (eppnt->p_flags & PF_W) {
+ elf_prot |= PROT_WRITE;
+ }
+ if (eppnt->p_flags & PF_X) {
+ elf_prot |= PROT_EXEC;
+ }
vaddr = load_bias + eppnt->p_vaddr;
vaddr_po = TARGET_ELF_PAGEOFFSET(vaddr);
--
2.20.1
- [PULL 00/48] target-arm queue, Peter Maydell, 2020/10/27
- [PULL 01/48] linux-user/aarch64: Reset btype for signals, Peter Maydell, 2020/10/27
- [PULL 05/48] linux-user/elfload: Fix coding style in load_elf_image,
Peter Maydell <=
- [PULL 10/48] linux-user/elfload: Parse NT_GNU_PROPERTY_TYPE_0 notes, Peter Maydell, 2020/10/27
- [PULL 08/48] linux-user/elfload: Use Error for load_elf_image, Peter Maydell, 2020/10/27
- [PULL 04/48] linux-user/elfload: Avoid leaking interp_name using GLib memory API, Peter Maydell, 2020/10/27
- [PULL 02/48] linux-user: Set PAGE_TARGET_1 for TARGET_PROT_BTI, Peter Maydell, 2020/10/27
- [PULL 09/48] linux-user/elfload: Use Error for load_elf_interp, Peter Maydell, 2020/10/27
- [PULL 03/48] include/elf: Add defines related to GNU property notes for AArch64, Peter Maydell, 2020/10/27
- [PULL 06/48] linux-user/elfload: Adjust iteration over phdr, Peter Maydell, 2020/10/27
- [PULL 07/48] linux-user/elfload: Move PT_INTERP detection to first loop, Peter Maydell, 2020/10/27
- [PULL 13/48] hw/arm/highbank: Silence warnings about missing fallthrough statements, Peter Maydell, 2020/10/27
- [PULL 14/48] hw/arm: fix min_cpus for xlnx-versal-virt platform, Peter Maydell, 2020/10/27