tests: Bluetooth: shell: Fix connection reference leak #66484
Merged
Conversation
This file contains 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
zephyrbot
requested review from
alwa-nordic,
asbjornsabo,
hermabe,
jhedberg,
jori-nordic,
kruithofa,
sjanc,
Thalley,
theob-pro and
Vudentz
This fixes regression introduced in recently. Redundant connection reference is taken twice in connected() callback. The redunant reference was then not returned, and as a result we had a leak. Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
This basically reverts changes made by 9c8ec58. Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
MariuszSkamra
force-pushed
the
bt_shell_fix
branch
from
81a3530
to
a43d9d4
Compare
sjanc
approved these changes
Dec 13, 2023
jhedberg
reviewed
Dec 13, 2023
Comment on lines
+2846
to
+2847
| err = bt_conn_le_create(&addr, create_params, BT_LE_CONN_PARAM_DEFAULT, | ||
| &conn); |
There was a problem hiding this comment.
Seems like it'd make sense to update bt_conn_le_create() to accept NULL as the last parameter in cases like this (i.e. where you don't do anything meaningful with the pointer even after a successful return).
jhedberg
reviewed
Dec 13, 2023
| @@ -694,8 +694,6 @@ static void connected(struct bt_conn *conn, uint8_t err) | |||
| } | |||
| } | |||
|
|
|||
| default_conn = bt_conn_ref(conn); | |||
There was a problem hiding this comment.
I can see the bug with the ref getting taken twice for ROLE_PERIPHERAL, but where is default_conn getting set for ROLE_CENTRAL?
There was a problem hiding this comment.
I can see the bug with the ref getting taken twice for
ROLE_PERIPHERAL, but where isdefault_conngetting set forROLE_CENTRAL?
Nevermind, I'm just blind.
jhedberg
approved these changes
Dec 13, 2023
Thalley
approved these changes
Dec 13, 2023
alwa-nordic
approved these changes
Dec 14, 2023
msmttchr
approved these changes
Dec 14, 2023
There was a problem hiding this comment.
@MariuszSkamra, this seems to fix the double reference problem. Thanks
HoZHel
approved these changes
Dec 14, 2023
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.
This fixes regression introduced in recently.
Redundant connection reference is taken twice in connected()
callback. The redunant reference was then not returned, and
as a result we had a leak.