Skip to contentSkip to conversation

objtool: Fix memory leak in elf_alloc_reloc() on realloc failure

PATCH In review Weigang He 3 participants 3 messages Jan 18 – Jan 19

Subsystems (2)
lore
Share & tools
lore

Weigang He

author
#0 lore raw

PATCH 1/1 objtool: Fix memory leak in elf_alloc_reloc() on realloc failure

When realloc() fails in elf_alloc_reloc(), the original buffer pointer is overwritten with NULL before the failure is detected. This causes the original buffer to become unreachable, resulting in a memory leak.

Fix this by using a temporary variable to hold the realloc() result. If realloc() fails, free the original buffer and set d_buf to NULL to maintain the expected error state before returning -1.

This bug is found by my static analysis tool and my code review.

---
 tools/objtool/elf.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
tools/objtool/elf.c +6 -3
index 6a8ed9c62323e..e47c5c4f25314 100644
@@ -1521,12 +1521,15 @@ static int elf_alloc_reloc(struct elf *elf, struct section *rsec)
 		memcpy(rsec->data->d_buf, orig_buf,
 		       nr_relocs_old * elf_rela_size(elf));
 	} else {
-		rsec->data->d_buf = realloc(rsec->data->d_buf,
-					    nr_alloc * elf_rela_size(elf));
-		if (!rsec->data->d_buf) {
+		void *new_d_buf = realloc(rsec->data->d_buf,
+					  nr_alloc * elf_rela_size(elf));
+		if (!new_d_buf) {
 			ERROR_GLIBC("realloc");
+			free(rsec->data->d_buf);
+			rsec->data->d_buf = NULL;
 			return -1;
 		}
+		rsec->data->d_buf = new_d_buf;
 	}
 
 	rsec->nr_alloc_relocs = nr_alloc;
Signature · 1 line
2.34.1
#1 lore raw

…

Quoted 1 line

This bug is found by my static analysis tool …

* Did it get a special name?

* Was any additional background information published for such a source code analysis tool?

Regards,
Markus

maintainer
#2 lore raw
In reply to Weigang He
Quoted 9 lines · Weigang He

When realloc() fails in elf_alloc_reloc(), the original buffer pointer is overwritten with NULL before the failure is detected. This causes the original buffer to become unreachable, resulting in a memory leak.

Fix this by using a temporary variable to hold the realloc() result. If realloc() fails, free the original buffer and set d_buf to NULL to maintain the expected error state before returning -1.

This bug is found by my static analysis tool and my code review.

Yeah, except that the moment this error is actually hit, the tool will exit, freeing all memory.