RDKEMW-12176: btrCore_PopulateListOfPairedCrash_p#75
Open
PreethiALPI wants to merge 1 commit into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses a crash during teardown (e.g., deep sleep) by adding teardown-awareness to btrCore and updating unit tests to validate termination behavior.
Changes:
- Add a global “terminating” flag and per-handle generation tracking to reduce UAF risk during teardown.
- Harden service-data copying by clamping advertised service-data length to the destination buffer size.
- Update/extend unit tests to initialize generation and assert termination behavior across DeInit scenarios.
Reviewed changes
Copilot reviewed 2 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
src/btrCore.c |
Adds termination/generation tracking and a termination guard in paired-device population; clamps service-data copy length. |
include/btrCore.h |
Exposes UNIT_TEST-only helpers for generation/termination inspection. |
unitTest/test_btrCore.c |
Updates tests to set generation, resets terminator where needed, and adds DeInit termination tests. |
Comments suppressed due to low confidence (1)
src/btrCore.c:1226
- The trace loop iterates using the source service-data length, but reads from the destination buffer (
pcData) which is clamped toBTRCORE_MAX_SERVICE_DATA_LEN. IfsaServices[count].lenexceeds the max, this will read past the end ofpcData(OOB read) during logging.
for (int i =0; i < apstBTDeviceInfo->saServices[count].len; i++){
BTRCORELOG_TRACE ("ServiceData[%d] = [%x]\n ", i, lstFoundDevice.stAdServiceData[count].pcData[i]);
}
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+298
to
+301
| void btrCore_ResetTerminatorForTest(void) { | ||
| g_atomic_int_set(&gIsBtrCoreTerminating, 0); | ||
| gint val = g_atomic_int_get(&gIsBtrCoreTerminating); | ||
| } |
Comment on lines
+303
to
+306
| void btrCore_SetTerminatorForTest(void) { | ||
| g_atomic_int_set(&gIsBtrCoreTerminating, 1); | ||
| gint val = g_atomic_int_get(&gIsBtrCoreTerminating); | ||
| } |
| @@ -4171,6 +4350,7 @@ void test_BTRCore_SetAdvertisementInfo_NullAdvtType(void) { | |||
| tBTRCoreHandle hBTRCore = (tBTRCoreHandle)1; // Mock handle | |||
| char advtBeaconName[] = "BeaconName"; | |||
|
|
|||
| /* Invalid handle value - should never be deferenced */ | |||
Reason for change: Crash fix Test Procedure: Device deepsleep causing the crash Risks: Low Priority: P2 Signed-off-by: ppalan289 <preethi_palanisamy@comcast.com>
PreethiALPI
force-pushed
the
RDKEMW-12176_a1
branch
from
beef42a to
3b92c89
Compare
Comment on lines
+1518
to
+1522
| /* Prevent UAF when worker threads run during teardown */ | ||
| if(g_atomic_int_get(&gIsBtrCoreTerminating)) { | ||
| BTRCORELOG_WARN("btrCore: Ignoring PopulateListOfPairedDevices during termination\n"); | ||
| return enBTRCoreFailure; | ||
| } |
Comment on lines
+298
to
+301
| void btrCore_ResetTerminatorForTest(void) { | ||
| g_atomic_int_set(&gIsBtrCoreTerminating, 0); | ||
| gint val = g_atomic_int_get(&gIsBtrCoreTerminating); | ||
| } |
Comment on lines
+303
to
+306
| void btrCore_SetTerminatorForTest(void) { | ||
| g_atomic_int_set(&gIsBtrCoreTerminating, 1); | ||
| gint val = g_atomic_int_get(&gIsBtrCoreTerminating); | ||
| } |
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
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.
Reason for change: Crash fix
Test Procedure: Device deepsleep causing the crash
Risks: Low
Priority: P2