diff options
| author | Zhaofeng Li <hello@zhaofeng.li> | 2021-09-13 20:51:38 -0700 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2021-09-14 13:20:31 +0200 |
| commit | bfaebfb3ac740345eafda251a871638014983ba7 (patch) | |
| tree | ea9b436021d42aa238bb4ba82c66cc651c7bd891 /kexec/arch/i386/kexec-elf-x86.c | |
| parent | 091f9e91bb24c475f7e09347de71cce811a2b314 (diff) | |
x86: Consolidate elf_x86_probe routines
Signed-off-by: Zhaofeng Li <hello@zhaofeng.li>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/arch/i386/kexec-elf-x86.c')
| -rw-r--r-- | kexec/arch/i386/kexec-elf-x86.c | 44 |
1 files changed, 37 insertions, 7 deletions
diff --git a/kexec/arch/i386/kexec-elf-x86.c b/kexec/arch/i386/kexec-elf-x86.c index fedf031..8eba242 100644 --- a/kexec/arch/i386/kexec-elf-x86.c +++ b/kexec/arch/i386/kexec-elf-x86.c @@ -42,7 +42,7 @@ static const int probe_debug = 0; -int elf_x86_probe(const char *buf, off_t len) +int elf_x86_any_probe(const char *buf, off_t len, enum coretype arch) { struct mem_ehdr ehdr; @@ -56,20 +56,50 @@ int elf_x86_probe(const char *buf, off_t len) } /* Verify the architecuture specific bits */ - if ((ehdr.e_machine != EM_386) && (ehdr.e_machine != EM_486)) { - /* for a different architecture */ - if (probe_debug) { - fprintf(stderr, "Not i386 ELF executable\n"); + switch (arch) { + case CORE_TYPE_ELF32: + if ((ehdr.e_machine != EM_386) && (ehdr.e_machine != EM_486)) { + if (probe_debug) + fprintf(stderr, "Not i386 ELF executable\n"); + result = -1; + goto out; } - result = -1; - goto out; + break; + + case CORE_TYPE_ELF64: + if (ehdr.e_machine != EM_X86_64) { + if (probe_debug) + fprintf(stderr, "Not x86_64 ELF executable\n"); + result = -1; + goto out; + } + break; + + case CORE_TYPE_UNDEF: + default: + if ( + (ehdr.e_machine != EM_386) && + (ehdr.e_machine != EM_486) && + (ehdr.e_machine != EM_X86_64) + ) { + if (probe_debug) + fprintf(stderr, "Not i386 or x86_64 ELF executable\n"); + result = -1; + goto out; + } + break; } + result = 0; out: free_elf_info(&ehdr); return result; } +int elf_x86_probe(const char *buf, off_t len) { + return elf_x86_any_probe(buf, len, CORE_TYPE_ELF32); +} + void elf_x86_usage(void) { printf( " --command-line=STRING Set the kernel command line to STRING\n" |