diff -uNr mkelfImage-2.7/linux-i386/mkelf-linux-i386.c mkelfImage-2.7.x/linux-i386/mkelf-linux-i386.c --- mkelfImage-2.7/linux-i386/mkelf-linux-i386.c 2006-03-17 06:08:22.000000000 -0800 +++ mkelfImage-2.7.x/linux-i386/mkelf-linux-i386.c 2006-10-31 13:22:07.000000000 -0800 @@ -19,13 +19,16 @@ static void (*parse_kernel_type)(struct kernel_info *info, char *kernel_buf, size_t kernel_size); static void parse_bzImage_kernel(struct kernel_info *info, char *kernel_buf, size_t kernel_size); static void parse_elf32_kernel(struct kernel_info *info, char *kernel_buf, size_t kernel_size); +static void parse_elf64_kernel(struct kernel_info *info, char *kernel_buf, size_t kernel_size); + +char *vmlinux_x86_64_probe(char *kernel_buf, off_t kernel_size); char *vmlinux_i386_probe(char *kernel_buf, off_t kernel_size) { Elf32_Ehdr *ehdr; Elf32_Phdr *phdr; int i; - int hdr1, hdr2; + int phdrs; ehdr = (Elf32_Ehdr *)kernel_buf; if ( (ehdr->e_ident[EI_MAG0] != ELFMAG0) || @@ -35,7 +38,8 @@ return "No ELF signature found on kernel\n"; } if (ehdr->e_ident[EI_CLASS] != ELFCLASS32) { - return "Not a 32bit ELF kernel\n"; + return vmlinux_x86_64_probe(kernel_buf, kernel_size); +// return "Not a 32bit ELF kernel\n"; } if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) { return "Not a little endian ELF kernel\n"; @@ -54,27 +58,64 @@ return "Kernel uses bad program header size.\n"; } phdr = (Elf32_Phdr *)(kernel_buf + le32_to_cpu(ehdr->e_phoff)); - hdr1 = hdr2 = -1; - for(i = 0; i < le32_to_cpu(ehdr->e_phnum); i++) { + phdrs = 0; + for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) { if (le32_to_cpu(phdr[i].p_type) != PT_LOAD) continue; - if (((hdr1 != -1) && - ((le32_to_cpu(phdr[hdr1].p_paddr) & 0xfffffff) != 0x100000)) || - (hdr2 != -1)) { - return "Too many PT_LOAD segments to be a linux kernel\n"; - } - if (hdr1 == -1) { - hdr1 = i; - } else { - hdr2 = i; - } + phdrs++; } - if (hdr1 == -1) { + if (phdrs == 0) { return "No PT_LOAD segments!\n"; } parse_kernel_type = parse_elf32_kernel; return 0; } +char *vmlinux_x86_64_probe(char *kernel_buf, off_t kernel_size) +{ + Elf64_Ehdr *ehdr; + Elf64_Phdr *phdr; + int i; + int phdrs = 0; + ehdr = (Elf64_Ehdr *)kernel_buf; + if ( + (ehdr->e_ident[EI_MAG0] != ELFMAG0) || + (ehdr->e_ident[EI_MAG1] != ELFMAG1) || + (ehdr->e_ident[EI_MAG2] != ELFMAG2) || + (ehdr->e_ident[EI_MAG3] != ELFMAG3)) { + return "No ELF signature found on kernel\n"; + } + if (ehdr->e_ident[EI_CLASS] != ELFCLASS64) { + return "Not a 64bit ELF kernel\n"; + } + if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) { + return "Not a little endian ELF kernel\n"; + } + if (le16_to_cpu(ehdr->e_type) != ET_EXEC) { + return "Not an executable kernel\n"; + } + if (le16_to_cpu(ehdr->e_machine) != EM_X86_64) { + return "Not an x86_64 kernel\n"; + } + if ( (ehdr->e_ident[EI_VERSION] != EV_CURRENT) || + (le32_to_cpu(ehdr->e_version) != EV_CURRENT)) { + return "Kernel not using ELF version 1.\n"; + } + if (le16_to_cpu(ehdr->e_phentsize) != sizeof(*phdr)) { + return "Kernel uses bad program header size.\n"; + } + phdr = (Elf64_Phdr *)(kernel_buf + le64_to_cpu(ehdr->e_phoff)); + phdrs = 0; + for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) { + if (le32_to_cpu(phdr[i].p_type) != PT_LOAD) + continue; + phdrs++; + } + if (phdrs == 0) { + return "No PT_LOAD segments!\n"; + } + parse_kernel_type = parse_elf64_kernel; + return 0; +} char *bzImage_i386_probe(char *kernel_buf, off_t kernel_size) { @@ -118,16 +159,12 @@ struct kernel_info { - void *kernel; - size_t filesz; - size_t memsz; - size_t paddr; - size_t vaddr; - void *kernel2; - size_t filesz2; - size_t memsz2; - size_t paddr2; - size_t vaddr2; + int phdrs; + void *kernel[4]; + size_t filesz[4]; + size_t memsz[4]; + size_t paddr[4]; + size_t vaddr[4]; size_t entry; char *version; }; @@ -137,43 +174,53 @@ Elf32_Ehdr *ehdr; Elf32_Phdr *phdr; int i; - int hdr1, hdr2; + int phdrs; ehdr = (Elf32_Ehdr *)kernel_buf; phdr = (Elf32_Phdr *)(kernel_buf + ehdr->e_phoff); - hdr1 = hdr2 = -1; + phdrs = 0; for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) { if (le32_to_cpu(phdr[i].p_type) != PT_LOAD) continue; - if (hdr2 != -1) { - die("Too many PT_LOAD segments to be a linux kernel\n"); - } - if (hdr1 == -1) { - hdr1 = i; - } else { - hdr2 = i; - } - } - if (hdr1 == -1) { - die("No PT_LOAD segments!\n"); - } - info->kernel = kernel_buf + le32_to_cpu(phdr[hdr1].p_offset); - info->filesz = le32_to_cpu(phdr[hdr1].p_filesz); - info->memsz = le32_to_cpu(phdr[hdr1].p_memsz); - info->paddr = le32_to_cpu(phdr[hdr1].p_paddr) & 0xfffffff; - info->vaddr = le32_to_cpu(phdr[hdr1].p_vaddr); - - if (hdr2 != -1) { - info->kernel2 = kernel_buf + le32_to_cpu(phdr[hdr2].p_offset); - info->filesz2 = le32_to_cpu(phdr[hdr2].p_filesz); - info->memsz2 = le32_to_cpu(phdr[hdr2].p_memsz); - info->paddr2 = le32_to_cpu(phdr[hdr2].p_paddr) & 0xfffffff; - info->vaddr2 = le32_to_cpu(phdr[hdr2].p_vaddr); + info->kernel[phdrs] = kernel_buf + le32_to_cpu(phdr[i].p_offset); + info->filesz[phdrs] = le32_to_cpu(phdr[i].p_filesz); + info->memsz[phdrs] = le32_to_cpu(phdr[i].p_memsz); + info->paddr[phdrs] = le32_to_cpu(phdr[i].p_paddr) & 0xfffffff; + info->vaddr[phdrs] = le32_to_cpu(phdr[i].p_vaddr); + phdrs++; } - + + info->phdrs = phdrs; info->entry = 0x100000; info->version = "unknown"; } +static void parse_elf64_kernel(struct kernel_info *info, char *kernel_buf, size_t kernel_size) +{ + Elf64_Ehdr *ehdr; + Elf64_Phdr *phdr; + int i; + int phdrs; + ehdr = (Elf64_Ehdr *)kernel_buf; + phdr = (Elf64_Phdr *)(kernel_buf + le64_to_cpu(ehdr->e_phoff)); + + phdrs = 0; + for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) { + if (le32_to_cpu(phdr[i].p_type) != PT_LOAD) + continue; + info->kernel[phdrs] = kernel_buf + le64_to_cpu(phdr[i].p_offset); + info->filesz[phdrs] = le64_to_cpu(phdr[i].p_filesz); + info->memsz[phdrs] = le64_to_cpu(phdr[i].p_memsz); + info->paddr[phdrs] = le64_to_cpu(phdr[i].p_paddr) & 0xffffff; + info->vaddr[phdrs] = le64_to_cpu(phdr[i].p_vaddr); + phdrs++; + } + + info->phdrs = phdrs; + info->entry = 0x100000; + info->version = "unknown"; +} + + static void parse_bzImage_kernel(struct kernel_info *info, char *kernel_buf, size_t kernel_size) { struct x86_linux_header *hdr; @@ -186,12 +233,13 @@ } offset = 512 + (512 *setup_sects); - info->kernel = kernel_buf + offset; - info->filesz = kernel_size - offset; - info->memsz = 0x700000; - info->paddr = 0x100000; - info->vaddr = 0x100000; - info->entry = info->paddr; + info->kernel[0] = kernel_buf + offset; + info->filesz[0] = kernel_size - offset; + info->memsz[0] = 0x700000; + info->paddr[0] = 0x100000; + info->vaddr[0] = 0x100000; + info->phdrs = 1; + info->entry = info->paddr[0]; info->version = kernel_buf + 512 + le16_to_cpu(hdr->kver_addr); } @@ -237,6 +285,7 @@ struct kernel_info kinfo; struct image_parameters *params; int index; + int i; int opt; static const struct option options[] = { @@ -310,7 +359,7 @@ /* Add a program header for the note section */ index = 4; - index += kinfo.kernel2 ? 1:0; + index += (kinfo.phdrs - 1); index += ramdisk_size ? 1:0; phdr = add_program_headers(ehdr, index); @@ -331,20 +380,14 @@ phdr[2].p_memsz = (GDTLOC - REAL_MODE_DATA_LOC) + params->gdt_size; phdr[2].p_data = 0; - phdr[3].p_paddr = kinfo.paddr; - phdr[3].p_vaddr = kinfo.vaddr; - phdr[3].p_filesz = kinfo.filesz; - phdr[3].p_memsz = kinfo.memsz; - phdr[3].p_data = kinfo.kernel; - - index = 4; + index = 3; /* Put the second kernel frament if present */ - if (kinfo.kernel2) { - phdr[index].p_paddr = kinfo.paddr2; - phdr[index].p_vaddr = kinfo.vaddr2; - phdr[index].p_filesz = kinfo.filesz2; - phdr[index].p_memsz = kinfo.memsz2; - phdr[index].p_data = kinfo.kernel2; + for(i=0;ie_phoff)); phdrs = 0; for(i = 0; i < le16_to_cpu(ehdr->e_phnum); i++) { - if (le16_to_cpu(phdr[i].p_type) != PT_LOAD) + if (le32_to_cpu(phdr[i].p_type) != PT_LOAD) continue; phdrs++; }