diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 22d50bc23f..eff229567c 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -69,6 +69,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-adapter-restrict-delta-0-RSSI-to-proximity-filters.patch \ file://0001-gobex-Fix-ABORT-response-being-discarded.patch \ file://0001-obexd-pbap-Fix-u128_to_string-skipping-data-4.patch \ + file://0001-obexd-Fix-FILE-leak-in-phonebook-dummy.patch \ + file://0001-obexd-pbap-Fix-NewMissedCalls-parameter-size.patch \ + file://0001-obexd-pbap-Report-NewMissedCalls-for-mch.patch \ " S = "${UNPACKDIR}/bluez-${PV}" diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-obexd-Fix-FILE-leak-in-phonebook-dummy.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-obexd-Fix-FILE-leak-in-phonebook-dummy.patch new file mode 100644 index 0000000000..9b9cba331f --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/0001-obexd-Fix-FILE-leak-in-phonebook-dummy.patch @@ -0,0 +1,47 @@ +From 062fa5fc95282da2168dce96a6dc78cb2cefe572 Mon Sep 17 00:00:00 2001 +From: Jinwang Li +Date: Wed, 30 Sep 2026 15:39:53 +0800 +Subject: [PATCH 1/3] obexd: Fix FILE* leak in phonebook-dummy + +fdopen(fd, "r") transfers ownership of fd to the FILE stream, but the +loop was calling close(fd) directly instead of fclose(fp), leaking the +FILE structure and its stdio buffer on every vCard read. Also handle +fdopen() failure, which was previously unchecked. + +Upstream-Status: Backport [https://github.com/bluez/bluez/commit/549f3d50686bbf18f01b949a913ddd10cb6e8b5c] +Signed-off-by: Jinwang Li +--- + obexd/plugins/phonebook-dummy.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/obexd/plugins/phonebook-dummy.c b/obexd/plugins/phonebook-dummy.c +index 0dce13f66..188429a21 100644 +--- a/obexd/plugins/phonebook-dummy.c ++++ b/obexd/plugins/phonebook-dummy.c +@@ -164,6 +164,14 @@ static int foreach_vcard(DIR *dp, vcard_func_t func, uint16_t offset, + } + + fp = fdopen(fd, "r"); ++ if (fp == NULL) { ++ err = errno; ++ error("fdopen(%s): %s(%d)", filename, strerror(err), ++ err); ++ close(fd); ++ continue; ++ } ++ + v = Parse_MIME_FromFile(fp); + if (v != NULL) { + func(filename, v, user_data); +@@ -171,7 +179,7 @@ static int foreach_vcard(DIR *dp, vcard_func_t func, uint16_t offset, + n++; + } + +- close(fd); ++ fclose(fp); + } + + g_slist_free_full(sorted, g_free); +-- +2.34.1 + diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-obexd-pbap-Fix-NewMissedCalls-parameter-size.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-obexd-pbap-Fix-NewMissedCalls-parameter-size.patch new file mode 100644 index 0000000000..da5a7d634e --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/0001-obexd-pbap-Fix-NewMissedCalls-parameter-size.patch @@ -0,0 +1,110 @@ +From fd39102cd189c524b60915feb46f075d0c12c972 Mon Sep 17 00:00:00 2001 +From: Jinwang Li +Date: Tue, 27 Oct 2026 15:10:45 +0800 +Subject: [PATCH 2/3] obexd/pbap: Fix NewMissedCalls parameter size + +NewMissedCalls is a one-byte apparam, but was encoded with +g_obex_apparam_set_uint16(). Use uint8 instead, and update the +phonebook callback type to match. + +Fixes: 398d3e23533a ("obexd: Make use of GObexApparam API") +Upstream-Status: Backport [https://github.com/bluez/bluez/commit/f1af76b9868ef8f7f403d572f07fc533b1908eda] +Signed-off-by: Jinwang Li +--- + obexd/plugins/irmc.c | 4 ++-- + obexd/plugins/pbap.c | 8 ++++---- + obexd/plugins/phonebook-tracker.c | 2 +- + obexd/plugins/phonebook.h | 2 +- + 4 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/obexd/plugins/irmc.c b/obexd/plugins/irmc.c +index cfd8a45d4..b9888bbed 100644 +--- a/obexd/plugins/irmc.c ++++ b/obexd/plugins/irmc.c +@@ -74,7 +74,7 @@ static const char *owner_vcard = + "END:VCARD\r\n"; + + static void phonebook_size_result(const char *buffer, size_t bufsize, +- int vcards, int missed, ++ int vcards, uint8_t missed, + gboolean lastpart, void *user_data) + { + struct irmc_session *irmc = user_data; +@@ -90,7 +90,7 @@ static void phonebook_size_result(const char *buffer, size_t bufsize, + } + + static void query_result(const char *buffer, size_t bufsize, int vcards, +- int missed, gboolean lastpart, void *user_data) ++ uint8_t missed, gboolean lastpart, void *user_data) + { + struct irmc_session *irmc = user_data; + const char *s, *t; +diff --git a/obexd/plugins/pbap.c b/obexd/plugins/pbap.c +index 9f8684863..3ee54f1fe 100644 +--- a/obexd/plugins/pbap.c ++++ b/obexd/plugins/pbap.c +@@ -159,7 +159,7 @@ static void cache_clear(struct cache *cache) + } + + static void phonebook_size_result(const char *buffer, size_t bufsize, +- int vcards, int missed, ++ int vcards, uint8_t missed, + gboolean lastpart, void *user_data) + { + struct pbap_session *pbap = user_data; +@@ -186,7 +186,7 @@ static void phonebook_size_result(const char *buffer, size_t bufsize, + DBG("missed %d", missed); + } + +- pbap->obj->apparam = g_obex_apparam_set_uint16(pbap->obj->apparam, ++ pbap->obj->apparam = g_obex_apparam_set_uint8(pbap->obj->apparam, + NEWMISSEDCALLS_TAG, + missed); + +@@ -194,7 +194,7 @@ static void phonebook_size_result(const char *buffer, size_t bufsize, + } + + static void query_result(const char *buffer, size_t bufsize, int vcards, +- int missed, gboolean lastpart, void *user_data) ++ uint8_t missed, gboolean lastpart, void *user_data) + { + struct pbap_session *pbap = user_data; + +@@ -224,7 +224,7 @@ static void query_result(const char *buffer, size_t bufsize, int vcards, + pbap->obj->firstpacket = TRUE; + } + +- pbap->obj->apparam = g_obex_apparam_set_uint16(pbap->obj->apparam, ++ pbap->obj->apparam = g_obex_apparam_set_uint8(pbap->obj->apparam, + NEWMISSEDCALLS_TAG, + missed); + +diff --git a/obexd/plugins/phonebook-tracker.c b/obexd/plugins/phonebook-tracker.c +index eb7a84f46..2f7411312 100644 +--- a/obexd/plugins/phonebook-tracker.c ++++ b/obexd/plugins/phonebook-tracker.c +@@ -488,7 +488,7 @@ struct phonebook_data { + GSList *contacts; + phonebook_cache_ready_cb ready_cb; + phonebook_entry_cb entry_cb; +- int newmissedcalls; ++ uint8_t newmissedcalls; + GCancellable *query_canc; + char *req_name; + int vcard_part_count; +diff --git a/obexd/plugins/phonebook.h b/obexd/plugins/phonebook.h +index c73ae73b8..f3150e1f6 100644 +--- a/obexd/plugins/phonebook.h ++++ b/obexd/plugins/phonebook.h +@@ -61,7 +61,7 @@ struct apparam_field { + * Contacts will be returned in the vcard format. + */ + typedef void (*phonebook_cb) (const char *buffer, size_t bufsize, +- int vcards, int missed, gboolean lastpart, void *user_data); ++ int vcards, uint8_t missed, gboolean lastpart, void *user_data); + + /* + * Interface between the PBAP core and backends to +-- +2.34.1 + diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-obexd-pbap-Report-NewMissedCalls-for-mch.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-obexd-pbap-Report-NewMissedCalls-for-mch.patch new file mode 100644 index 0000000000..b907c32088 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/0001-obexd-pbap-Report-NewMissedCalls-for-mch.patch @@ -0,0 +1,74 @@ +From 615a26bd9b6c53a06c278d74dce790e557ddfb6e Mon Sep 17 00:00:00 2001 +From: Jinwang Li +Date: Tue, 27 Oct 2026 15:10:46 +0800 +Subject: [PATCH 3/3] obexd/pbap: Report NewMissedCalls for mch + +The dummy backend always reports zero NewMissedCalls. Count the +vCards in the folder instead, capped at UINT8_MAX. + +Fixes PTS test PBAP/PSE/PBD/BV-05-C + +Upstream-Status: Backport [https://github.com/bluez/bluez/commit/d987dbc0f0817fa7927be174920713dfe2aaff13] +Signed-off-by: Jinwang Li +--- + obexd/plugins/phonebook-dummy.c | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +diff --git a/obexd/plugins/phonebook-dummy.c b/obexd/plugins/phonebook-dummy.c +index 188429a21..d04cc98e0 100644 +--- a/obexd/plugins/phonebook-dummy.c ++++ b/obexd/plugins/phonebook-dummy.c +@@ -41,6 +41,7 @@ struct dummy_data { + char *folder; + int fd; + guint id; ++ uint8_t newmissedcalls; + }; + + struct cache_query { +@@ -244,7 +245,8 @@ static gboolean read_dir(void *user_data) + closedir(dp); + done: + /* FIXME: Missing vCards fields filtering */ +- dummy->cb(buffer->str, buffer->len, count, 0, TRUE, dummy->user_data); ++ dummy->cb(buffer->str, buffer->len, count, dummy->newmissedcalls, ++ TRUE, dummy->user_data); + + g_string_free(buffer, TRUE); + +@@ -360,6 +362,22 @@ static gboolean is_dir(const char *dir) + return S_ISDIR(st.st_mode); + } + ++static uint8_t count_vcards(const char *folder) ++{ ++ DIR *dp; ++ uint16_t count = 0; ++ ++ dp = opendir(folder); ++ if (dp == NULL) ++ return 0; ++ ++ foreach_vcard(dp, NULL, 0, UINT8_MAX, NULL, &count); ++ ++ closedir(dp); ++ ++ return count; ++} ++ + char *phonebook_set_folder(const char *current_folder, + const char *new_folder, uint8_t flags, int *err) + { +@@ -490,6 +508,9 @@ void *phonebook_pull(const char *name, const struct apparam_field *params, + dummy->folder = folder; + dummy->fd = -1; + ++ if (g_strcmp0(name, PB_CALLS_MISSED) == 0) ++ dummy->newmissedcalls = count_vcards(folder); ++ + if (err) + *err = 0; + +-- +2.34.1 +