HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 53dd99bc LLB |
1 | From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 |
| 2 | From: John Reiser <jreiser@BitWagon.com> | |
| 3 | Date: Fri, 11 Dec 2020 13:38:18 -0800 | |
| 4 | Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ | |
| 5 | ||
| 6 | https://github.com/upx/upx/issues/421 | |
| 7 | modified: p_lx_elf.cpp | |
| 8 | --- | |
| 9 | src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- | |
| 10 | 1 file changed, 29 insertions(+), 5 deletions(-) | |
| 11 | ||
| 12 | diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp | |
| 13 | index 182db192..3a4101cf 100644 | |
| 14 | --- a/src/p_lx_elf.cpp | |
| 15 | +++ b/src/p_lx_elf.cpp | |
| 16 | @@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() | |
| 17 | int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; | |
| 18 | if (z_rel && z_rsz) { | |
| 19 | unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); | |
| 20 | + if ((unsigned)file_size <= rel_off) { | |
| 21 | + char msg[70]; snprintf(msg, sizeof(msg), | |
| 22 | + "bad Elf32_Dynamic[DT_REL] %#x\n", | |
| 23 | + rel_off); | |
| 24 | + throwCantPack(msg); | |
| 25 | + } | |
| 26 | Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; | |
| 27 | unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); | |
| 28 | + if ((unsigned)file_size <= relsz) { | |
| 29 | + char msg[70]; snprintf(msg, sizeof(msg), | |
| 30 | + "bad Elf32_Dynamic[DT_RELSZ] %#x\n", | |
| 31 | + relsz); | |
| 32 | + throwCantPack(msg); | |
| 33 | + } | |
| 34 | Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); | |
| 35 | for (; rp < last; ++rp) { | |
| 36 | unsigned r_va = get_te32(&rp->r_offset); | |
| 37 | @@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() | |
| 38 | int z_rel = dt_table[Elf64_Dyn::DT_RELA]; | |
| 39 | int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; | |
| 40 | if (z_rel && z_rsz) { | |
| 41 | - unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); | |
| 42 | + upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); | |
| 43 | + if ((u64_t)file_size <= rel_off) { | |
| 44 | + char msg[70]; snprintf(msg, sizeof(msg), | |
| 45 | + "bad Elf64_Dynamic[DT_RELA] %#llx\n", | |
| 46 | + rel_off); | |
| 47 | + throwCantPack(msg); | |
| 48 | + } | |
| 49 | Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; | |
| 50 | - unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); | |
| 51 | + upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); | |
| 52 | + if ((u64_t)file_size <= relsz) { | |
| 53 | + char msg[70]; snprintf(msg, sizeof(msg), | |
| 54 | + "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", | |
| 55 | + relsz); | |
| 56 | + throwCantPack(msg); | |
| 57 | + } | |
| 58 | Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); | |
| 59 | for (; rp < last; ++rp) { | |
| 60 | - unsigned r_va = get_te64(&rp->r_offset); | |
| 61 | + upx_uint64_t r_va = get_te64(&rp->r_offset); | |
| 62 | if (r_va == user_init_ava) { // found the Elf64_Rela | |
| 63 | - unsigned r_info = get_te64(&rp->r_info); | |
| 64 | + upx_uint64_t r_info = get_te64(&rp->r_info); | |
| 65 | unsigned r_type = ELF64_R_TYPE(r_info); | |
| 66 | if (Elf64_Ehdr::EM_AARCH64 == e_machine | |
| 67 | && R_AARCH64_RELATIVE == r_type) { | |
| 68 | @@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() | |
| 69 | } | |
| 70 | else { | |
| 71 | char msg[50]; snprintf(msg, sizeof(msg), | |
| 72 | - "bad relocation %#x DT_INIT_ARRAY[0]", | |
| 73 | + "bad relocation %#llx DT_INIT_ARRAY[0]", | |
| 74 | r_info); | |
| 75 | throwCantPack(msg); | |
| 76 | } |