Apply AI-generated patch for unchecked nullable dereferences in JFDS#73096
Open
apahl-cl wants to merge 2 commits into
Open
Apply AI-generated patch for unchecked nullable dereferences in JFDS#73096apahl-cl wants to merge 2 commits into
apahl-cl wants to merge 2 commits into
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request fixes a potential crash in JointFabricDatastore::UpdateGroup by ensuring that groupKeySetID, groupCAT, and groupCATVersion are checked for null before calling .Value(). It also adds corresponding regression tests. The review feedback points out a type mismatch in the test code where groupCAT is cast to uint16_t instead of uint32_t, which could lead to truncation.
|
|
||
| JointFabricCluster::Commands::UpdateGroup::DecodableType updateGroup; | ||
| updateGroup.groupID = 11; | ||
| updateGroup.groupCAT.SetNonNull(static_cast<uint16_t>(0x1234)); |
Contributor
There was a problem hiding this comment.
The groupCAT field represents a CASE Authenticated Tag (CAT), which is a 32-bit value (uint32_t / chip::CATId). Casting it to uint16_t is a type mismatch and can lead to silent truncation if a 32-bit CAT value is used in the future. Please cast it to uint32_t instead.
updateGroup.groupCAT.SetNonNull(static_cast<uint32_t>(0x1234));
apahl-cl
added
the
request-backport-supported
|
PR #73096: Size comparison from 517b1a1 to ac1b55f Full report (32 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, nrfconnect, psoc6, qpg, realtek, stm32, telink)
|
|
PR #73096: Size comparison from d17f626 to bc3cf4e Full report (33 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, psoc6, qpg, realtek, stm32, telink)
|
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #73096 +/- ##
==========================================
+ Coverage 57.01% 57.03% +0.02%
==========================================
Files 1655 1655
Lines 114161 114164 +3
Branches 13229 13213 -16
==========================================
+ Hits 65084 65116 +32
+ Misses 49077 49048 -29 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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
1 participant
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.
Summary
We add null checks to various Optional derefs in JointFabricDatastore.cpp. Also, this PR includes unit tests that catch scenarios where the unchecked derefs would cause a crash. With the null checks in place, no crash will occur.
AI disclosure: this patch was AI generated, but the problem and fix were manually reviewed.
Related issues
#71880 is similar, but it seems like the cited derefs are no longer present after some reworks in joint-fabric-datastore-server.cpp.
I looked for additional unsafe derefs in JFDS code and couldn't find any.
Testing
source scripts/activate.sh ninja -C out/linux-x64-tests-asan-clang tests/TestJointFabricDatastore ./out/linux-x64-tests-asan-clang/tests/TestJointFabricDatastoreThe newly added tests will only pass if the patch is applied to JointFabricDatastore.cpp.