[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/12] linux-user: Tidy loader_exec
From: |
Richard Henderson |
Subject: |
[PATCH 03/12] linux-user: Tidy loader_exec |
Date: |
Fri, 18 Jun 2021 20:43:20 -0700 |
Reorg the if cases to reduce indentation.
Test for 4 bytes in the file before checking the signatures.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/linuxload.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c
index 3b0bafc490..8b93b9704c 100644
--- a/linux-user/linuxload.c
+++ b/linux-user/linuxload.c
@@ -143,31 +143,31 @@ int loader_exec(int fdexec, const char *filename, char
**argv, char **envp,
retval = prepare_binprm(bprm);
- if (retval >= 0) {
- if (bprm->buf[0] == 0x7f
- && bprm->buf[1] == 'E'
- && bprm->buf[2] == 'L'
- && bprm->buf[3] == 'F') {
- retval = load_elf_binary(bprm, infop);
-#if defined(TARGET_HAS_BFLT)
- } else if (bprm->buf[0] == 'b'
- && bprm->buf[1] == 'F'
- && bprm->buf[2] == 'L'
- && bprm->buf[3] == 'T') {
- retval = load_flt_binary(bprm, infop);
-#endif
- } else {
- return -ENOEXEC;
- }
+ if (retval < 4) {
+ return -ENOEXEC;
}
-
- if (retval >= 0) {
- /* success. Initialize important registers */
- do_init_thread(regs, infop);
+ if (bprm->buf[0] == 0x7f
+ && bprm->buf[1] == 'E'
+ && bprm->buf[2] == 'L'
+ && bprm->buf[3] == 'F') {
+ retval = load_elf_binary(bprm, infop);
+#if defined(TARGET_HAS_BFLT)
+ } else if (bprm->buf[0] == 'b'
+ && bprm->buf[1] == 'F'
+ && bprm->buf[2] == 'L'
+ && bprm->buf[3] == 'T') {
+ retval = load_flt_binary(bprm, infop);
+#endif
+ } else {
+ return -ENOEXEC;
+ }
+ if (retval < 0) {
return retval;
}
- return retval;
+ /* Success. Initialize important registers. */
+ do_init_thread(regs, infop);
+ return 0;
}
bool imgsrc_read(void *dst, off_t offset, size_t len,
--
2.25.1
- [PATCH 00/12] linux-user: Load a vdso for x86_64 and hppa, Richard Henderson, 2021/06/18
- [PATCH 01/12] linux-user: Fix style problems in linuxload.c, Richard Henderson, 2021/06/18
- [PATCH 02/12] linux-user: Introduce imgsrc_read, imgsrc_read_alloc, Richard Henderson, 2021/06/18
- [PATCH 03/12] linux-user: Tidy loader_exec,
Richard Henderson <=
- [PATCH 04/12] linux-user: Do not clobber bprm_buf swapping ehdr, Richard Henderson, 2021/06/18
- [PATCH 06/12] linux-user: Use ImageSource in load_symbols, Richard Henderson, 2021/06/18
- [PATCH 05/12] linux-user: Use ImageSource in load_elf_image, Richard Henderson, 2021/06/18
- [PATCH 12/12] linux-user/hppa: Add vdso and use it for rt_sigreturn, Richard Henderson, 2021/06/18
- [PATCH 07/12] linux-user: Replace bprm->fd with bprm->src.fd, Richard Henderson, 2021/06/18
- [PATCH 09/12] linux-user: Load vdso image if available, Richard Henderson, 2021/06/18
- [PATCH 11/12] linux-user/x86_64: Add vdso, Richard Henderson, 2021/06/18
- [PATCH 08/12] linux-user: Introduce imgsrc_mmap, Richard Henderson, 2021/06/18