From a7966a71fbe8c2f2840662ad86e2ec8474152909 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Mon, 13 Apr 2026 08:12:45 +0200 Subject: [PATCH] Drop unused patches Related: RHEL-166377 --- ...-leak-on-early-return-in-file_append.patch | 30 ------------- 0007-whitespace-fix.patch | 26 ------------ ...x-32-bit-ELF-dynamic-section-parsing.patch | 42 ------------------- 3 files changed, 98 deletions(-) delete mode 100644 0006-Potential-memory-leak-on-early-return-in-file_append.patch delete mode 100644 0007-whitespace-fix.patch delete mode 100644 0008-Fix-32-bit-ELF-dynamic-section-parsing.patch diff --git a/0006-Potential-memory-leak-on-early-return-in-file_append.patch b/0006-Potential-memory-leak-on-early-return-in-file_append.patch deleted file mode 100644 index 41356fc..0000000 --- a/0006-Potential-memory-leak-on-early-return-in-file_append.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 49d824ef1fdeca5ea5bb28ea6e68a24d21a96756 Mon Sep 17 00:00:00 2001 -From: Steve Grubb -Date: Wed, 28 Jan 2026 21:29:17 -0500 -Subject: [PATCH] Potential memory leak on early-return in file_append -Content-type: text/plain - -If add_list_load_path(path) returns failure after adding items to add_list, the function returns without calling list_empty, which can leak any accumulated entries. Call list_empty before returning an error. ---- - src/cli/file-cli.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cli/file-cli.c b/src/cli/file-cli.c -index 7e02e939fdb0..b07d42ee070c 100644 ---- a/src/cli/file-cli.c -+++ b/src/cli/file-cli.c -@@ -130,8 +130,10 @@ int file_append(const char *path, const char *fname, bool use_filter) - - list_init(&add_list); - rc = add_list_load_path(path); -- if (rc) -+ if (rc) { -+ list_empty(&add_list); // could be partially populated by nftw - return rc; -+ } - - if (use_filter && filter_prune_list(&add_list, NULL)) { - list_empty(&add_list); --- -2.53.0 - diff --git a/0007-whitespace-fix.patch b/0007-whitespace-fix.patch deleted file mode 100644 index 57dfedb..0000000 --- a/0007-whitespace-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b91b460b943185a1585cbbfe331eac38527b64cb Mon Sep 17 00:00:00 2001 -From: Steve Grubb -Date: Wed, 28 Jan 2026 22:07:10 -0500 -Subject: [PATCH] whitespace fix -Content-type: text/plain - ---- - src/library/rpm-backend.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/library/rpm-backend.c b/src/library/rpm-backend.c -index 5b24c9589040..c4a90cd1c9f1 100644 ---- a/src/library/rpm-backend.c -+++ b/src/library/rpm-backend.c -@@ -443,7 +443,7 @@ out: - // cleaning up - struct _hash_record *item, *tmp; - HASH_ITER( hh, hashtable, item, tmp) { -- HASH_DEL( hashtable, item ); -+ HASH_DEL( hashtable, item ); - free((void*)item->key); - free((void*)item); - } --- -2.53.0 - diff --git a/0008-Fix-32-bit-ELF-dynamic-section-parsing.patch b/0008-Fix-32-bit-ELF-dynamic-section-parsing.patch deleted file mode 100644 index 938baaa..0000000 --- a/0008-Fix-32-bit-ELF-dynamic-section-parsing.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f87d54e6eede34a6ef4b77df56ec1df9e313822d Mon Sep 17 00:00:00 2001 -From: Petr Lautrbach -Date: Fri, 6 Feb 2026 14:31:52 +0100 -Subject: [PATCH] Fix 32-bit ELF dynamic section parsing -Content-type: text/plain - -Use Elf32_Dyn instead of Elf64_Dyn when parsing PT_DYNAMIC segments in -32-bit ELF files. The incorrect type could cause a segfault on special -32 bit libraries. - -Fixes: https://issues.redhat.com/browse/RHEL-1357 - -Signed-off-by: Petr Lautrbach ---- - src/library/file.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/library/file.c b/src/library/file.c -index 802a89cc028a..2dffaaceea1e 100644 ---- a/src/library/file.c -+++ b/src/library/file.c -@@ -1485,7 +1485,7 @@ uint32_t gather_elf(int fd, off_t size) - if (ph_tbl[i].p_filesz > size) - goto err_out32; - -- Elf64_Dyn *dyn_tbl = malloc(ph_tbl[i].p_filesz); -+ Elf32_Dyn *dyn_tbl = malloc(ph_tbl[i].p_filesz); - - if((unsigned int)lseek(fd, ph_tbl[i].p_offset, - SEEK_SET) != -@@ -1494,7 +1494,7 @@ uint32_t gather_elf(int fd, off_t size) - goto err_out32; - } - -- num = ph_tbl[i].p_filesz / sizeof(Elf64_Dyn); -+ num = ph_tbl[i].p_filesz / sizeof(Elf32_Dyn); - if (num > 1000) { - free(dyn_tbl); - goto err_out32; --- -2.53.0 -