RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-31 01:11:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix copy pasta

Browse source
This commit is contained in:
iceman1001 2022-02-26 17:40:24 +01:00
parent 3e543fcc65
commit b776c98422
1 changed files with 10 additions and 1 deletions

11
client/src/flash.c
View file

@ -306,39 +306,45 @@ int flash_load(flash_file_t *ctx, bool force) {
res = PM3_EFILE; res = PM3_EFILE;
goto fail; goto fail;
} }
if (le16(ehdr->e_type) != ET_EXEC) { if (le16(ehdr->e_type) != ET_EXEC) {
PrintAndLogEx(ERR, "ELF is not executable"); PrintAndLogEx(ERR, "ELF is not executable");
res = PM3_EFILE; res = PM3_EFILE;
goto fail; goto fail;
} }
if (le16(ehdr->e_machine) != EM_ARM) { if (le16(ehdr->e_machine) != EM_ARM) {
PrintAndLogEx(ERR, "Wrong ELF architecture"); PrintAndLogEx(ERR, "Wrong ELF architecture");
res = PM3_EFILE; res = PM3_EFILE;
goto fail; goto fail;
} }
if (!ehdr->e_phnum || !ehdr->e_phoff) { if (!ehdr->e_phnum || !ehdr->e_phoff) {
PrintAndLogEx(ERR, "ELF has no PHDRs"); PrintAndLogEx(ERR, "ELF has no PHDRs");
res = PM3_EFILE; res = PM3_EFILE;
goto fail; goto fail;
} }
if (le16(ehdr->e_phentsize) != sizeof(Elf32_Phdr_t)) { if (le16(ehdr->e_phentsize) != sizeof(Elf32_Phdr_t)) {
// could be a structure padding issue... // could be a structure padding issue...
PrintAndLogEx(ERR, "Either the ELF file or this code is made of fail"); PrintAndLogEx(ERR, "Either the ELF file or this code is made of fail");
res = PM3_EFILE; res = PM3_EFILE;
goto fail; goto fail;
} }
ctx->num_phdrs = le16(ehdr->e_phnum); ctx->num_phdrs = le16(ehdr->e_phnum);
ctx->phdrs = (Elf32_Phdr_t *)(ctx->elf + le32(ehdr->e_phoff)); ctx->phdrs = (Elf32_Phdr_t *)(ctx->elf + le32(ehdr->e_phoff));
shdrs = (Elf32_Shdr_t *)(ctx->elf + le32(ehdr->e_shoff)); shdrs = (Elf32_Shdr_t *)(ctx->elf + le32(ehdr->e_shoff));
shdrs = (Elf32_Shdr_t *)(ctx->elf + le32(ehdr->e_shoff));
shstr = ctx->elf + le32(shdrs[ehdr->e_shstrndx].sh_offset); shstr = ctx->elf + le32(shdrs[ehdr->e_shstrndx].sh_offset);
for (uint16_t i = 0; i < le16(ehdr->e_shnum); i++) { for (uint16_t i = 0; i < le16(ehdr->e_shnum); i++) {
if (strcmp(((char *)shstr) + shdrs[i].sh_name, ".version_information") == 0) { if (strcmp(((char *)shstr) + shdrs[i].sh_name, ".version_information") == 0) {
vi = (struct version_information_t *)(ctx->elf + le32(shdrs[i].sh_offset)); vi = (struct version_information_t *)(ctx->elf + le32(shdrs[i].sh_offset));
res = print_and_validate_version(vi); res = print_and_validate_version(vi);
break; break;
} }
if (strcmp(((char *)shstr) + shdrs[i].sh_name, ".bootphase1") == 0) { if (strcmp(((char *)shstr) + shdrs[i].sh_name, ".bootphase1") == 0) {
uint32_t offset = *(uint32_t*)(ctx->elf + le32(shdrs[i].sh_offset) + le32(shdrs[i].sh_size) - 4); uint32_t offset = *(uint32_t*)(ctx->elf + le32(shdrs[i].sh_offset) + le32(shdrs[i].sh_size) - 4);
if (offset >= le32(shdrs[i].sh_addr)) { if (offset >= le32(shdrs[i].sh_addr)) {
@ -353,11 +359,14 @@ int flash_load(flash_file_t *ctx, bool force) {
} }
if (res == PM3_SUCCESS) if (res == PM3_SUCCESS)
return res; return res;
// We could not find proper version_information // We could not find proper version_information
if (res == PM3_EUNDEF) if (res == PM3_EUNDEF)
PrintAndLogEx(WARNING, "Unable to check version_information"); PrintAndLogEx(WARNING, "Unable to check version_information");
if (force) if (force)
return PM3_SUCCESS; return PM3_SUCCESS;
PrintAndLogEx(INFO, "Make sure to flash a correct and up-to-date version"); PrintAndLogEx(INFO, "Make sure to flash a correct and up-to-date version");
PrintAndLogEx(INFO, "You can force flashing this firmware by using the option '--force'"); PrintAndLogEx(INFO, "You can force flashing this firmware by using the option '--force'");
fail: fail: