mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-15 23:56:23 +09:00
62f7970a5a
This does not actually change normal behaviour, but adds a check that
should detect corruption of relocation data (e.g. by using BSS data
prior to relocation).
Also add additional debugging output when enabled.
During this investigation, two situations have been seen:
1. calculate_relocation_address():
uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start;
turns into
111166f: b8 83 c4 17 01 mov $0x117c483,%eax
whih is beyond the end of bss:
0117b484 g .bss 00000000 __bss_end
Somehow the __bss_end here is 255 bytes ahead.
2. do_elf_reloc_fixups():
uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start;
Here the __text_start is 0 in the file:
1111d9f: bb a0 e0 13 01 mov $0x113e0a0,%ebx
1111da4: 81 ef 00 00 00 00 sub $0x0,%edi
As it happens, both of these are in pre-relocation code.
For these reasons we silent check and ignore bad relocations.
Signed-off-by: Simon Glass <sjg@chromium.org>
125 lines
3.3 KiB
C
125 lines
3.3 KiB
C
/*
|
|
* (C) Copyright 2008-2011
|
|
* Graeme Russ, <graeme.russ@gmail.com>
|
|
*
|
|
* (C) Copyright 2002
|
|
* Daniel Engström, Omicron Ceti AB, <daniel@omicron.se>
|
|
*
|
|
* (C) Copyright 2002
|
|
* Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
|
|
*
|
|
* (C) Copyright 2002
|
|
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
|
|
* Marius Groeger <mgroeger@sysgo.de>
|
|
*
|
|
* See file CREDITS for list of people who contributed to this
|
|
* project.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
* MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <libfdt.h>
|
|
#include <malloc.h>
|
|
#include <asm/u-boot-x86.h>
|
|
#include <asm/relocate.h>
|
|
#include <elf.h>
|
|
|
|
int copy_uboot_to_ram(void)
|
|
{
|
|
size_t len = (size_t)&__data_end - (size_t)&__text_start;
|
|
|
|
memcpy((void *)gd->relocaddr, (void *)&__text_start, len);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int copy_fdt_to_ram(void)
|
|
{
|
|
if (gd->arch.new_fdt) {
|
|
ulong fdt_size;
|
|
|
|
fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32);
|
|
|
|
memcpy(gd->arch.new_fdt, gd->fdt_blob, fdt_size);
|
|
debug("Relocated fdt from %p to %p, size %lx\n",
|
|
gd->fdt_blob, gd->arch.new_fdt, fdt_size);
|
|
gd->fdt_blob = gd->arch.new_fdt;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int clear_bss(void)
|
|
{
|
|
ulong dst_addr = (ulong)&__bss_start + gd->reloc_off;
|
|
size_t len = (size_t)&__bss_end - (size_t)&__bss_start;
|
|
|
|
memset((void *)dst_addr, 0x00, len);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* This function has more error checking than you might expect. Please see
|
|
* the commit message for more informaiton.
|
|
*/
|
|
int do_elf_reloc_fixups(void)
|
|
{
|
|
Elf32_Rel *re_src = (Elf32_Rel *)(&__rel_dyn_start);
|
|
Elf32_Rel *re_end = (Elf32_Rel *)(&__rel_dyn_end);
|
|
|
|
Elf32_Addr *offset_ptr_rom, *last_offset = NULL;
|
|
Elf32_Addr *offset_ptr_ram;
|
|
|
|
/* The size of the region of u-boot that runs out of RAM. */
|
|
uintptr_t size = (uintptr_t)&__bss_end - (uintptr_t)&__text_start;
|
|
|
|
do {
|
|
/* Get the location from the relocation entry */
|
|
offset_ptr_rom = (Elf32_Addr *)re_src->r_offset;
|
|
|
|
/* Check that the location of the relocation is in .text */
|
|
if (offset_ptr_rom >= (Elf32_Addr *)CONFIG_SYS_TEXT_BASE &&
|
|
offset_ptr_rom > last_offset) {
|
|
|
|
/* Switch to the in-RAM version */
|
|
offset_ptr_ram = (Elf32_Addr *)((ulong)offset_ptr_rom +
|
|
gd->reloc_off);
|
|
|
|
/* Check that the target points into .text */
|
|
if (*offset_ptr_ram >= CONFIG_SYS_TEXT_BASE &&
|
|
*offset_ptr_ram <=
|
|
(CONFIG_SYS_TEXT_BASE + size)) {
|
|
*offset_ptr_ram += gd->reloc_off;
|
|
} else {
|
|
debug(" %p: rom reloc %x, ram %p, value %x,"
|
|
" limit %lx\n", re_src,
|
|
re_src->r_offset, offset_ptr_ram,
|
|
*offset_ptr_ram,
|
|
CONFIG_SYS_TEXT_BASE + size);
|
|
}
|
|
} else {
|
|
debug(" %p: rom reloc %x, last %p\n", re_src,
|
|
re_src->r_offset, last_offset);
|
|
}
|
|
last_offset = offset_ptr_rom;
|
|
|
|
} while (++re_src < re_end);
|
|
|
|
return 0;
|
|
}
|