gatt-server: Fix crash while disconnecting
Luiz Augusto von Dentz
maintainerPATCH 1/1 gatt-server: Fix crash while disconnecting
From: Luiz Augusto von Dentz <[email protected]>
If there is a pending notify multiple the code was not removing before freeing the object causing the following crash:
Invalid read of size 8
at 0x4A3D10: notify_multiple (gatt-server.c:1703)
by 0x4D05F0: timeout_callback (timeout-glib.c:25)
by 0x4956900: ??? (in /usr/lib64/libglib-2.0.so.0.7000.5) by 0x49560AE: g_main_context_dispatch
(in /usr/lib64/libglib-2.0.so.0.7000.5)
by 0x49AB307: ??? (in /usr/lib64/libglib-2.0.so.0.7000.5) by 0x49557C2: g_main_loop_run
(in /usr/lib64/libglib-2.0.so.0.7000.5)
by 0x4D0A34: mainloop_run (mainloop-glib.c:66)
by 0x4D0F2B: mainloop_run_with_signal (mainloop-notify.c:188) by 0x2B0CD1: main (main.c:1276)
Address 0x6ca35c8 is 136 bytes inside a block of size 144 free'd
at 0x48470E4: free (vg_replace_malloc.c:872)
by 0x415E73: gatt_server_cleanup (device.c:698)
by 0x415E73: attio_cleanup (device.c:715)
by 0x47745B: queue_foreach (queue.c:207)
by 0x490C54: disconnect_cb (att.c:701)
by 0x4CF4AF: watch_callback (io-glib.c:157)
by 0x49560AE: g_main_context_dispatch
(in /usr/lib64/libglib-2.0.so.0.7000.5)
by 0x49AB307: ??? (in /usr/lib64/libglib-2.0.so.0.7000.5) by 0x49557C2: g_main_loop_run
(in /usr/lib64/libglib-2.0.so.0.7000.5)
by 0x4D0A34: mainloop_run (mainloop-glib.c:66)
by 0x4D0F2B: mainloop_run_with_signal (mainloop-notify.c:188) by 0x2B0CD1: main (main.c:1276)
--- src/shared/gatt-server.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-)
src/shared/gatt-server.c +28 -5
@@ -121,11 +121,26 @@ struct bt_gatt_server {struct nfy_mult_data *nfy_mult; }; +static void notify_multiple_free (struct bt_gatt_server *server) +{ +if (!server->nfy_mult) +return ; + +if (server->nfy_mult->id) +timeout_remove (server->nfy_mult->id); + +free (server->nfy_mult->pdu); +free (server->nfy_mult); + server->nfy_mult =NULL ; +} +static void bt_gatt_server_free (struct bt_gatt_server *server) {if (server->debug_destroy) server->debug_destroy (server->debug_data); +notify_multiple_free (server); +bt_att_unregister (server->att, server->mtu_id);bt_att_unregister (server->att, server->read_by_grp_type_id);bt_att_unregister (server->att, server->read_by_type_id);
@@ -1695,17 +1710,26 @@ bool bt_gatt_server_set_debug(struct bt_gatt_server *server,return true; } +static void notify_multiple_timeout_remove (struct bt_gatt_server *server) +{ +if (!server->nfy_mult->id) +return ; + +timeout_remove (server->nfy_mult->id); + server->nfy_mult->id =0 ; +} +static bool notify_multiple (void *user_data) {struct bt_gatt_server *server = user_data; + server->nfy_mult->id =0 ; +bt_att_send (server->att,BT_ATT_OP_HANDLE_NFY_MULT , server->nfy_mult->pdu, server->nfy_mult->offset,NULL ,NULL ,NULL ); -free (server->nfy_mult->pdu); -free (server->nfy_mult); - server->nfy_mult =NULL ; +notify_multiple_free (server);return false; }
@@ -1737,8 +1761,7 @@ bool bt_gatt_server_send_notification(struct bt_gatt_server *server,/* flush buffered data if this request hits buffer size limit */ if (data && data->offset >0 && data->len - data->offset <4 + length) { -if (server->nfy_mult->id) -timeout_remove (server->nfy_mult->id); +notify_multiple_timeout_remove (server);notify_multiple (server);/* data has been freed by notify_multiple */ data =NULL ;
Signature · 1 line
2.35.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=643344
---Test result---
Test Summary:
CheckPatch PASS 0.66 seconds GitLint PASS 0.46 seconds Prep - Setup ELL PASS 52.05 seconds Build - Prep PASS 0.48 seconds Build - Configure PASS 10.03 seconds Build - Make PASS 1455.43 seconds Make Check PASS 12.39 seconds Make Check w/Valgrind PASS 526.31 seconds Make Distcheck PASS 275.38 seconds Build w/ext ELL - Configure PASS 10.22 seconds Build w/ext ELL - Make PASS 1424.75 seconds Incremental Build with patchesPASS 0.00 seconds
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 33 lines · On Thu, 19 May 2022 14:40:02 -0700 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
If there is a pending notify multiple the code was not removing before freeing the object causing the following crash:
Invalid read of size 8
at0x4A3D10:notify_multiple(gatt-server.c:1703)
by0x4D05F0:timeout_callback(timeout-glib.c:25)
by0x4956900: ??? (in/usr/lib64/libglib-2.0.so.0.7000.5) by0x49560AE:g_main_context_dispatch
(in/usr/lib64/libglib-2.0.so.0.7000.5)
by0x49AB307: ??? (in/usr/lib64/libglib-2.0.so.0.7000.5) by0x49557C2:g_main_loop_run
(in/usr/lib64/libglib-2.0.so.0.7000.5)
by0x4D0A34:mainloop_run(mainloop-glib.c:66)
by0x4D0F2B:mainloop_run_with_signal(mainloop-notify.c:188) by0x2B0CD1: main (main.c:1276)
Address0x6ca35c8is 136 bytes inside a block of size 144 free'd
at0x48470E4: free (vg_replace_malloc.c:872)
by0x415E73:gatt_server_cleanup(device.c:698)
by0x415E73:attio_cleanup(device.c:715)
by0x47745B:queue_foreach(queue.c:207)
by0x490C54:disconnect_cb(att.c:701)
by0x4CF4AF:watch_callback(io-glib.c:157)
by0x49560AE:g_main_context_dispatch
(in/usr/lib64/libglib-2.0.so.0.7000.5)
by0x49AB307: ??? (in/usr/lib64/libglib-2.0.so.0.7000.5) by0x49557C2:g_main_loop_run
(in/usr/lib64/libglib-2.0.so.0.7000.5)
by0x4D0A34:mainloop_run(mainloop-glib.c:66)
by0x4D0F2B:mainloop_run_with_signal(mainloop-notify.c:188) by0x2B0CD1: main (main.c:1276)
Quoted 1 line
[...]
Here is the summary with links:
- [BlueZ] gatt-server: Fix crash while disconnecting
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=f1069c4fe106
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html