From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ v2 2/4] sdp-xml: Fix leaking the parse stack on malformed input
Date: Mon, 17 Aug 2026 17:00:36 -0400 [thread overview]
Message-ID: <20260817210038.1839617-2-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20260817210038.1839617-1-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
sdp_xml_parse_record() frees its context but never the elements left on
ctx_data->stack_head.
element_end() returns early without popping the stack when it rejects a
document, for instance on a mismatched </sequence> close, so a malformed
record leaves its elements behind and they are never freed.
Free the remaining stack elements before returning. Found with the
compute-seq-size-type-confusion.xml test:
56 (direct) + 1,072 (indirect) bytes in 1 blocks are definitely lost
at calloc (vg_replace_malloc.c:1678)
by sdp_xml_data_alloc (sdp-xml.c:73)
by element_start (sdp-xml.c:473)
by g_markup_parse_context_parse (gmarkup.c:1369)
by sdp_xml_parse_record (sdp-xml.c:696)
Assisted-by: Claude:claude-opus-5
---
src/sdp-xml.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/sdp-xml.c b/src/sdp-xml.c
index bad9e289344f..bcd5785f87ca 100644
--- a/src/sdp-xml.c
+++ b/src/sdp-xml.c
@@ -551,6 +551,17 @@ static void sdp_xml_data_free(struct sdp_xml_data *elem)
free(elem);
}
+/* Free the elements left on the stack, e.g. by a document that is malformed */
+static void sdp_xml_data_free_stack(struct sdp_xml_data *elem)
+{
+ while (elem) {
+ struct sdp_xml_data *next = elem->next;
+
+ sdp_xml_data_free(elem);
+ elem = next;
+ }
+}
+
static void element_end(GMarkupParseContext *context,
const char *element_name, gpointer user_data, GError **err)
{
@@ -696,6 +707,7 @@ sdp_record_t *sdp_xml_parse_record(const char *data, int size)
if (g_markup_parse_context_parse(ctx, data, size, NULL) == FALSE) {
error("XML parsing error");
g_markup_parse_context_free(ctx);
+ sdp_xml_data_free_stack(ctx_data->stack_head);
sdp_record_free(record);
free(ctx_data);
return NULL;
@@ -703,6 +715,8 @@ sdp_record_t *sdp_xml_parse_record(const char *data, int size)
g_markup_parse_context_free(ctx);
+ sdp_xml_data_free_stack(ctx_data->stack_head);
+
free(ctx_data);
return record;
--
2.54.0
next prev parent reply other threads:[~2026-08-17 21:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-17 21:00 [PATCH BlueZ v2 1/4] sdp-xml: Use a queue to collect sequence members Luiz Augusto von Dentz
2026-08-17 21:00 ` Luiz Augusto von Dentz [this message]
2026-08-17 21:00 ` [PATCH BlueZ v2 3/4] sdp: Fix memory leak when freeing alternates Luiz Augusto von Dentz
2026-08-17 21:00 ` [PATCH BlueZ v2 4/4] unit/test-sdp-xml: Add a test parsing alternates Luiz Augusto von Dentz
2026-08-17 22:14 ` [BlueZ,v2,1/4] sdp-xml: Use a queue to collect sequence members bluez.test.bot
2026-08-18 14:40 ` [PATCH BlueZ v2 1/4] " Bastien Nocera
2026-08-18 18:37 ` patchwork-bot+bluetooth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260817210038.1839617-2-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox