Merge branch 'for-next/arm'
This commit is contained in:
commit
70d793e1d6
|
@ -326,7 +326,7 @@ static int aimage_load_resource(int fd, struct resource *r, void* buf, int ps)
|
||||||
|
|
||||||
ret = read_full(fd, buf, to_read);
|
ret = read_full(fd, buf, to_read);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
printf("could not read dummy %d\n", to_read);
|
printf("could not read dummy %u\n", to_read);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
|
||||||
|
|
||||||
offset = ELF32_R_SYM(rel->r_info);
|
offset = ELF32_R_SYM(rel->r_info);
|
||||||
if (offset < 0 || offset > (symsec->sh_size / sizeof(Elf32_Sym))) {
|
if (offset < 0 || offset > (symsec->sh_size / sizeof(Elf32_Sym))) {
|
||||||
printf("%s: bad relocation, section %d reloc %d\n",
|
printf("%s: bad relocation, section %u reloc %u\n",
|
||||||
module->name, relindex, i);
|
module->name, relindex, i);
|
||||||
return -ENOEXEC;
|
return -ENOEXEC;
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
|
||||||
|
|
||||||
if (rel->r_offset < 0 || rel->r_offset > dstsec->sh_size - sizeof(u32)) {
|
if (rel->r_offset < 0 || rel->r_offset > dstsec->sh_size - sizeof(u32)) {
|
||||||
printf("%s: out of bounds relocation, "
|
printf("%s: out of bounds relocation, "
|
||||||
"section %d reloc %d offset %d size %d\n",
|
"section %u reloc %u offset %d size %d\n",
|
||||||
module->name, relindex, i, rel->r_offset,
|
module->name, relindex, i, rel->r_offset,
|
||||||
dstsec->sh_size);
|
dstsec->sh_size);
|
||||||
return -ENOEXEC;
|
return -ENOEXEC;
|
||||||
|
@ -68,7 +68,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
|
||||||
offset <= (s32)0xfe000000 ||
|
offset <= (s32)0xfe000000 ||
|
||||||
offset >= (s32)0x02000000) {
|
offset >= (s32)0x02000000) {
|
||||||
printf("%s: relocation out of range, section "
|
printf("%s: relocation out of range, section "
|
||||||
"%d reloc %d sym '%s'\n", module->name,
|
"%u reloc %u sym '%s'\n", module->name,
|
||||||
relindex, i, strtab + sym->st_name);
|
relindex, i, strtab + sym->st_name);
|
||||||
return -ENOEXEC;
|
return -ENOEXEC;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue