Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-02-05 13:24:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved elf_load_image() a bit.

Browse Source 
After enabling BOOT_SUPPORT_ELF64 on x86 the x86 kernel could no longer be
booted because too many kernel_args allocations were taking place and filling
kernel_args_ranges. This was because for each image load it would check if
the image is ELF64, fail and fall back to ELF32 (each ELF64 check allocated
a preloaded_image). Changed elf_load_image() so that it only tries both when
loading the kernel image, and then for modules it will only try the same ELF
class as the kernel image.
This commit is contained in:
Alex Smith 2012-06-24 17:51:05 +01:00
parent 035825cdfc
commit c2656eb9bd
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/system/boot/loader/elf.cpp
View File

@ -222,7 +222,7 @@ ELFLoader<Class>::Load(int fd, preloaded_image* _image)
// inbetween.
totalSize = secondRegion->start + secondRegion->size - firstRegion->start;
if (totalSize > image->text_region.size + image->data_region.size
+ 8 * 1024) {
+ 0x200000) {
status = B_BAD_DATA;
goto error1;
}
@ -543,22 +543,27 @@ elf_init()
status_t
elf_load_image(int fd, preloaded_image** _image)
{
status_t status;
status_t status = B_ERROR;
TRACE(("elf_load_image(fd = %d, _image = %p)\n", fd, _image));
#if BOOT_SUPPORT_ELF64
status = ELF64Loader::Create(fd, _image);
if (status == B_OK) {
return ELF64Loader::Load(fd, *_image);
} else if (status == B_BAD_TYPE) {
if (gKernelArgs.kernel_image == NULL
|| gKernelArgs.kernel_image->elf_class == ELFCLASS64) {
status = ELF64Loader::Create(fd, _image);
if (status == B_OK)
return ELF64Loader::Load(fd, *_image);
else if (status != B_BAD_TYPE)
return status;
}
#endif
if (gKernelArgs.kernel_image == NULL
|| gKernelArgs.kernel_image->elf_class == ELFCLASS32) {
status = ELF32Loader::Create(fd, _image);
if (status == B_OK)
return ELF32Loader::Load(fd, *_image);
#if BOOT_SUPPORT_ELF64
}
#endif
return status;
}