Bluetooth: host: Overwrite existing bond when IRK has been updated #33266
Conversation
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
github-actions
bot
added
area: Bluetooth
area: Bluetooth Host
Refactor update_keys_check helper function to operate on input keys input. This allows the function to be re-used on a keys structure that is not the current connection keys. This also avoids the helper function changing the connection state. The conn->le.keys pointer should at this point always have been assigned, as central when sending the pairing request, and as peripheral when receiving the pairing request at the very latest. Signed-off-by: Joakim Andersson <[email protected]>
Overwrite the existing bond when the IRK of the existing bond could not resolve the RPA of the peer. This would happen if the peer has deleted the bond and replaced the IRK that was used. Signed-off-by: Joakim Andersson <[email protected]>
joerchan
force-pushed
the
bt-fix-re-pair-new-irk
branch
from
8fb306d to
281f221
Compare
jhedberg
approved these changes
Mar 12, 2021
pdunaj
approved these changes
Mar 12, 2021
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-v1.14-branch v1.14-branch
# Navigate to the new working tree
cd .worktrees/backport-v1.14-branch
# Create a new branch
git switch --create backport-33266-to-v1.14-branch
# Cherry-pick the merged commits of this pull request and resolve the conflicts
git cherry-pick e06bac0e4f2537ec1547c1c2cca80d5f25fdf0a3~2..e06bac0e4f2537ec1547c1c2cca80d5f25fdf0a3
# Push it to GitHub
git push --set-upstream origin backport-33266-to-v1.14-branch
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v1.14-branchThen, create a pull request where the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Overwrite the existing bond when the IRK of the existing bond could not
resolve the RPA of the peer. This would happen if the peer has deleted
the bond and replaced the IRK that was used.