smp: save pairing keys to keystore before draining connection - #1003
Merged
Merged
Conversation
In `Session.on_pairing()`, `await self.connection.drain()` was placed before `await self.ctkd_task` and `await self.manager.on_pairing()`. When continuous GATT/EATT traffic occurs on the LE link immediately after SMP key distribution completes, `in_flight` on the LE connection remains > 0 until the traffic subsides. Waiting for `connection.drain()` before calling `manager.on_pairing()` delays storing the derived keys (including the CTKD BR/EDR link key) into the keystore. If the peer initiates a BR/EDR connection and requests link encryption during this window, Bumble fails to find the link key in its keystore and replies with `HCI_Link_Key_Request_Negative_Reply`. Fix this by updating the keystore and notifying the manager via `await self.manager.on_pairing()` before awaiting `self.connection.drain()` and resolving `self.pairing_result`.
Collaborator
Author
barbibulle
approved these changes
Oct 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
smp: save pairing keys to keystore before draining connection
In
Session.on_pairing(),await self.connection.drain()was placed beforeawait self.ctkd_taskandawait self.manager.on_pairing().When continuous GATT/EATT traffic occurs on the LE link immediately after SMP
key distribution completes,
in_flighton the LE connection remains > 0 untilthe traffic subsides. Waiting for
connection.drain()before callingmanager.on_pairing()delays storing the derived keys (including the CTKDBR/EDR link key) into the keystore. If the peer initiates a BR/EDR connection
and requests link encryption during this window, Bumble fails to find the link
key in its keystore and replies with
HCI_Link_Key_Request_Negative_Reply.Fix this by updating the keystore and notifying the manager via
await self.manager.on_pairing()before awaitingself.connection.drain()andresolving
self.pairing_result.