[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 02/18] linux-user: Tidy loader_exec
From: |
Richard Henderson |
Subject: |
[PATCH v4 02/18] linux-user: Tidy loader_exec |
Date: |
Wed, 16 Aug 2023 11:03:22 -0700 |
Reorg the if cases to reduce indentation.
Test for 4 bytes in the file before checking the signatures.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
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 3536dd8104..5b7e9ab983 100644
--- a/linux-user/linuxload.c
+++ b/linux-user/linuxload.c
@@ -154,31 +154,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.34.1
- [PATCH v4 00/18] linux-user: Implement VDSOs, Richard Henderson, 2023/08/16
- [PATCH v4 01/18] linux-user: Introduce imgsrc_read, imgsrc_read_alloc, Richard Henderson, 2023/08/16
- [PATCH v4 02/18] linux-user: Tidy loader_exec,
Richard Henderson <=
- [PATCH v4 03/18] linux-user: Do not clobber bprm_buf swapping ehdr, Richard Henderson, 2023/08/16
- [PATCH v4 04/18] linux-user: Use ImageSource in load_elf_image, Richard Henderson, 2023/08/16
- [PATCH v4 05/18] linux-user: Use ImageSource in load_symbols, Richard Henderson, 2023/08/16
- [PATCH v4 07/18] linux-user: Load vdso image if available, Richard Henderson, 2023/08/16
- [PATCH v4 06/18] linux-user: Replace bprm->fd with bprm->src.fd, Richard Henderson, 2023/08/16
- [PATCH v4 08/18] linux-user: Add gen-vdso tool, Richard Henderson, 2023/08/16
- [PATCH v4 09/18] linux-user/i386: Add vdso, Richard Henderson, 2023/08/16