From 81b8f20732954c4508baf2f77472b5435e3f851f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Sep 2022 11:10:11 +0100 Subject: gentoo auto-resync : 14:09:2022 - 11:10:10 --- dev-util/radare2/Manifest | 2 - dev-util/radare2/files/CVE-2022-1437.patch | 72 ---------------------- .../radare2/files/radare2-5.5.0-vector35.patch | 22 ------- 3 files changed, 96 deletions(-) delete mode 100644 dev-util/radare2/files/CVE-2022-1437.patch delete mode 100644 dev-util/radare2/files/radare2-5.5.0-vector35.patch (limited to 'dev-util/radare2') diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest index eef5df61e2af..2e3452352bff 100644 --- a/dev-util/radare2/Manifest +++ b/dev-util/radare2/Manifest @@ -1,5 +1,3 @@ -AUX CVE-2022-1437.patch 2434 BLAKE2B 8671f028406cea47719c393f6a96d3f32a569bf5dd9e97a215326c19fb273c569119a6f79d63e2a9b93ea7def7c09c0110cb28e0c2ce60a345ed297f1a7168c0 SHA512 c32141bd9a282c0b6ba38468a7a77c2df26ad1153f5ada6b6bc0cb9d647fc462a54262272a4113fb7dc1adedb88c3b97e25798553b9b3f2c99d961f8e2a6ea37 -AUX radare2-5.5.0-vector35.patch 785 BLAKE2B 7e53aa1258290682827a1ab22a1bfeec12222c7e7c7acdde40a0845f47729918c41de9c59bcc1e79cbd1d318944245994c348e6d76f56852803ffda27206216f SHA512 3d5d7c682482973a00d78736c3d92d29711e729d01a220da5b89f66f27fae2c71cf40173d9ca9616709d4a2cc55a0450ae003e3d97998e0dfff5dcb64eba7675 AUX radare2-5.7.0-vector35.patch 907 BLAKE2B f8bf7cd898a5bda19a50f8966b765bfe3d3b8bb39c9d7132fbe21e5c877400279ee7e79b4b0b367c46c05911cea401e7f2bcc1859ec7128321d7d6842a30ac78 SHA512 f6e2b1f5aa3fc33c09f273ecfc52dff7f9f4c1cf860e83f1928559a6555d0552b3b35aa02e7d1ebddd8c7d31757353779866581564bb8dd48b0dfb8da8beb154 DIST radare2-5.7.4-vector35-arm64.tar.gz 1050970 BLAKE2B 17b9f730b514d959640bd259af9ebdb44b951eb839dc62160da167f2ea3906a60b10e20ff32561cc9b625dfffd1a83d25f484c91e1976d61a18dd04b9bed9862 SHA512 bee2f8685dc3760fd51eaa2ab9c68aed2833386145fe164ca6dfc4a5aab20596d1c6305167da2c7410c25be1391853f82fddc1cfa2bfa8e473d7f52129c44a3b DIST radare2-5.7.4-vector35-armv7.tar.gz 255288 BLAKE2B ca96b3f68381a0987c4efa10dcb798194486019762e89d1eb19a3fd24f6983535eea792099c60e4c1a9d2bdb5baab119fe2e9a7a889fad5a14023e5f984959b8 SHA512 e9eb6cee02bbbb265914b1f9118c7a143ed76a201c085af5516855475bf7f3ad5f9c82d1548e85a0339fbc33e029ef0e4be9d8cef68d212ae16ce1a7f18453ff diff --git a/dev-util/radare2/files/CVE-2022-1437.patch b/dev-util/radare2/files/CVE-2022-1437.patch deleted file mode 100644 index 16e67c5d3193..000000000000 --- a/dev-util/radare2/files/CVE-2022-1437.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/libr/bin/format/mach0/coresymbolication.c -+++ b/libr/bin/format/mach0/coresymbolication.c -@@ -269,6 +269,9 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut - for (i = 0; i < hdr->n_sections && cursor < end; i++) { - ut8 *sect_start = cursor; - RCoreSymCacheElementSection *sect = &result->sections[i]; -+ if (cursor + (word_size * 4) > end) { -+ goto beach; -+ } - sect->vaddr = sect->paddr = r_read_ble (cursor, false, bits); - if (sect->vaddr < page_zero_size) { - sect->vaddr += page_zero_size; -@@ -359,6 +362,10 @@ RCoreSymCacheElement *r_coresym_cache_element_new(RBinFile *bf, RBuffer *buf, ut - continue; - } - string_origin = relative_to_strings? b + start_of_strings : cursor; -+ if (!string_origin) { -+ cursor += R_CS_EL_SIZE_LSYM; -+ continue; -+ } - lsym->flc.file = str_dup_safe (b, string_origin + file_name_off, end); - if (!lsym->flc.file) { - cursor += R_CS_EL_SIZE_LSYM; ---- a/libr/bin/p/bin_symbols.c -+++ b/libr/bin/p/bin_symbols.c -@@ -353,28 +353,30 @@ static bool check_buffer(RBinFile *bf, RBuffer *b) { - } - - static RList *symbols(RBinFile *bf) { -- RList *res = r_list_newf ((RListFree)r_bin_symbol_free); -- r_return_val_if_fail (res && bf->o && bf->o->bin_obj, res); -+ r_return_val_if_fail (bf && bf->o && bf->o->bin_obj, NULL); - RCoreSymCacheElement *element = bf->o->bin_obj; - size_t i; - HtUU *hash = ht_uu_new0 (); - if (!hash) { -- return res; -+ return NULL; - } -+ RList *res = r_list_newf ((RListFree)r_bin_symbol_free); - bool found = false; -- for (i = 0; i < element->hdr->n_lined_symbols; i++) { -- RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i]; -- if (!sym) { -- break; -- } -- ht_uu_find (hash, sym->paddr, &found); -- if (found) { -- continue; -- } -- RBinSymbol *s = bin_symbol_from_symbol (element, sym); -- if (s) { -- r_list_append (res, s); -- ht_uu_insert (hash, sym->paddr, 1); -+ if (element->lined_symbols) { -+ for (i = 0; i < element->hdr->n_lined_symbols; i++) { -+ RCoreSymCacheElementSymbol *sym = (RCoreSymCacheElementSymbol *)&element->lined_symbols[i]; -+ if (!sym) { -+ break; -+ } -+ ht_uu_find (hash, sym->paddr, &found); -+ if (found) { -+ continue; -+ } -+ RBinSymbol *s = bin_symbol_from_symbol (element, sym); -+ if (s) { -+ r_list_append (res, s); -+ ht_uu_insert (hash, sym->paddr, 1); -+ } - } - } - if (element->symbols) { diff --git a/dev-util/radare2/files/radare2-5.5.0-vector35.patch b/dev-util/radare2/files/radare2-5.5.0-vector35.patch deleted file mode 100644 index 5ebf58020d4d..000000000000 --- a/dev-util/radare2/files/radare2-5.5.0-vector35.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/libr/asm/arch/arm/v35arm64/Makefile -+++ b/libr/asm/arch/arm/v35arm64/Makefile -@@ -30,8 +30,7 @@ $(ALIBS): arch-arm64 arch-armv7 - - ## ARM64 - arch-arm64: -- git clone -q https://github.com/radareorg/vector35-arch-arm64 arch-arm64 -- cd arch-arm64 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARM64_COMMIT) -+ cd arch-arm64 - - $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS) - rm -f arm64dis.$(EXT_AR) -@@ -40,8 +39,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS) - - ## ARMV7 - arch-armv7: -- git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7 -- cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT) -+ cd arch-armv7 - - $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS) - rm -f armv7dis.$(EXT_AR) -- cgit v1.2.3