shared/uhid: Fix registering UHID_START multiple times
Luiz Augusto von Dentz
maintainerPATCH v3 1/2 shared/uhid: Fix registering UHID_START multiple times
From: Luiz Augusto von Dentz <[email protected]>
UHID_START callback shall only be registered once otherwise there is a risk of processing input queue multiple times.
--- src/shared/uhid.c | 13 ++++++++++--- unit/test-uhid.c | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-)
src/shared/uhid.c +10 -3
@@ -46,6 +46,7 @@ struct bt_uhid {struct queue *input;uint8_t type;bool created; +unsigned int start_id;bool started;struct uhid_replay *replay; };
@@ -246,7 +247,7 @@ unsigned int bt_uhid_register(struct bt_uhid *uhid, uint32_t event,return 0 ; notify = new0(struct uhid_notify, 1); - notify->id = uhid->notify_id++; + notify->id = ++uhid->notify_id ? uhid->notify_id : ++uhid->notify_id; notify->event = event; notify->func = func; notify->user_data = user_data;
@@ -351,6 +352,14 @@ int bt_uhid_create(struct bt_uhid *uhid, const char *name, bdaddr_t *src,if (uhid->created)return 0 ; +/* Register callback for UHID_START if not registered yet */ +if (!uhid->start_id) { + uhid->start_id =bt_uhid_register (uhid,UHID_START , uhid_start, + uhid); +if (!uhid->start_id) +return -ENOMEM ; + } +memset (&ev,0 ,sizeof (ev)); ev.type =UHID_CREATE2 ; strncpy((char *) ev.u.create2.name, name,
@@ -378,8 +387,6 @@ int bt_uhid_create(struct bt_uhid *uhid, const char *name, bdaddr_t *src,if (err)return err; -bt_uhid_register (uhid,UHID_START , uhid_start, uhid); - uhid->created = true; uhid->started = false; uhid->type = type;
unit/test-uhid.c +3 -1
@@ -233,8 +233,10 @@ static void test_client(gconstpointer data) err =bt_uhid_create (context->uhid,"" ,NULL ,NULL ,0 ,0 ,0 ,0 ,BT_UHID_NONE ,NULL ,0 ); -if (err <0 ) +if (err <0 ) { +tester_debug ("create failed: %s\n" ,strerror (-err));tester_test_failed (); + }if (g_str_equal (context->data->test_name,"/uhid/command/destroy" )) { err =bt_uhid_destroy (context->uhid, true);
Signature · 1 line
2.46.0
Luiz Augusto von Dentz
maintainerPATCH v3 2/2 shared/uhid: Fix not cleanup input queue on destroy
From: Luiz Augusto von Dentz <[email protected]>
The input queue shall be cleanup on bt_uhid_destroy since that shall not be carried to the next session even if the input node is not destroyed.
--- src/shared/uhid.c | 4 ++++ 1 file changed, 4 insertions(+)
src/shared/uhid.c +4 -0
@@ -504,6 +504,10 @@ int bt_uhid_destroy(struct bt_uhid *uhid, bool force)if (!uhid)return -EINVAL ; +/* Cleanup input queue */ +queue_destroy (uhid->input, free); + uhid->input =NULL ; +/* Force destroy for non-keyboard devices - keyboards are not destroyed * on disconnect since they can glitch on reconnection losing * keypresses.
Signature · 1 line
2.46.0
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Tue, 13 Aug 2024 10:29:34 -0400 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
UHID_STARTcallback shall only be registered once otherwise there is a risk of processing input queue multiple times.--- src/shared/uhid.c | 13 ++++++++++--- unit/test-uhid.c | 4 +++- 2 files changed, 13 insertions(+), 4 deletions(-)
Here is the summary with links:
- [BlueZ,v3,1/2] shared/uhid: Fix registering UHID_START multiple times
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=ee39d01fb9ee - [BlueZ,v3,2/2] shared/uhid: Fix not cleanup input queue on destroy https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=a13638e6ae38
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
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=879259
---Test result---
Test Summary:
CheckPatch PASS 0.76 seconds GitLint PASS 0.53 seconds BuildEll PASS 25.31 seconds BluezMake PASS 1715.75 seconds MakeCheck PASS 13.54 seconds MakeDistcheck PASS 183.50 seconds CheckValgrind PASS 258.93 seconds CheckSmatch PASS 361.11 seconds bluezmakeextell PASS 122.10 seconds IncrementalBuild PASS 3027.76 seconds ScanBuild PASS 1047.24 seconds
---
Regards,
Linux Bluetooth