summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2023-02-17 14:52:04 +0100
committerMark Wielaard <mark@klomp.org>2023-02-21 12:57:04 +0100
commiteb79a7bd87adc51dae77eb8d5ec37ad58ec71feb (patch)
tree60c0dfba1ba4edb4f6e2259e6ab7c2fa08ffafa1
parent77d237798c8f262d618bd3ed2db8864022bfcacb (diff)
downloadelfutils-eb79a7bd87adc51dae77eb8d5ec37ad58ec71feb.tar.gz
libasm: Fix use-after-free issue with circular single linked list cleanup
Pointed out by gcc 12 with -Wuse-after-free=3 In function ‘free_section’ asm_end.c:552:17: error: pointer ‘data’ used after ‘free’ [-Werror=use-after-free] 552 | while (oldp != scnp->content); | ~~~~~^~~~~~~~~~~~~~~~ asm_end.c:550:9: note: call to ‘free’ here 550 | free (oldp); | ^~~~~~~~~~~ Fix by freeing scnp->content last. Signed-off-by: Mark Wielaard <mark@klomp.org>
-rw-r--r--libasm/ChangeLog4
-rw-r--r--libasm/asm_end.c18
2 files changed, 14 insertions, 8 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index a12d14b3..f23d5914 100644
--- a/libasm/ChangeLog
+++ b/libasm/ChangeLog
@@ -1,3 +1,7 @@
+2023-02-17 Mark Wielaard <mark@klomp.org>
+
+ * asm_end.c (free_section): free scnp->content last.
+
2022-12-20 Mark Wielaard <mark@klomp.org>
* disasm_begin.c: Include libeblP.h.
diff --git a/libasm/asm_end.c b/libasm/asm_end.c
index c06d2366..29165ac4 100644
--- a/libasm/asm_end.c
+++ b/libasm/asm_end.c
@@ -541,16 +541,18 @@ free_section (AsmScn_t *scnp)
if (scnp->subnext != NULL)
free_section (scnp->subnext);
+ /* This is a circular single linked list. */
struct AsmData *data = scnp->content;
if (data != NULL)
- do
- {
- oldp = data;
- data = data->next;
- free (oldp);
- }
- while (oldp != scnp->content);
-
+ {
+ while (data != scnp->content)
+ {
+ oldp = data;
+ data = data->next;
+ free (oldp);
+ }
+ free (scnp->content);
+ }
free (scnp);
}