Fix for a potential inifite loop in PrepareToReadVendorReservedElements #18560
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
robszewczyk
requested review from
tcarmelveilleux,
andy31415,
emargolis and
bzbarsky-apple
pullapprove
bot
requested review from
anush-apple,
arkq,
Byungjoo-Lee,
carol-apple,
chrisdecenzo,
chshu,
chulspro,
Damian-Nordic,
dhrishi,
electrocucaracha,
erjiaqing,
franck-apple,
gjc13,
hawk248,
harsha-rajendran,
isiu-apple,
jelderton,
jepenven-silabs,
jmartinez-silabs,
jtung-apple,
kpschoedel,
lazarkov,
LuDuda,
mrjerryjohns,
msandstedt and
rgoliver
pullapprove
bot
requested review from
saurabhst,
selissia,
tecimovic,
turon,
vijs,
vivien-apple,
wbschiller,
woody-apple,
xylophone21,
yufengwangca and
yunhanw-google
Damian-Nordic
approved these changes
May 18, 2022
andy31415
approved these changes
May 18, 2022
|
@robszewczyk how hard would it be to add a unit test that fails before this change but passes after it, so that this never regresses? |
bzbarsky-apple
approved these changes
May 18, 2022
|
PR #18560: Size comparison from 02d8302 to 30182d4 Increases (1 build for linux)
Full report (27 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
|
@andy31415 -- it looks like adding a unit test is relatively straightforward, working on that now. Please do not merge until I've had a chance to add the test |
mrjerryjohns
approved these changes
May 18, 2022
robszewczyk
force-pushed
the
fix/potential_inifinite_loop
branch
from
30182d4 to
a416fbd
Compare
|
@andy31415 unit test added, loops without the fix. |
|
PR #18560: Size comparison from 3a7cbf8 to a416fbd Increases (4 builds for linux)
Full report (29 builds for cyw30739, efr32, k32w, linux, mbed, nrfconnect, p6, telink)
|
When scanning up through the elements in search of a Vendor Reserved element, `PrepareToReadVendorReser` would call `mTlvReader.Next()` inside a `while (true)` loop. Should the `TLVReader::Next()` return an error other than `END_OF_TLV` the loop reader would neither advance nor exit the loop. The change exits the function on any way in a way that parallels the earlier error checks on TLVReader errors.
robszewczyk
force-pushed
the
fix/potential_inifinite_loop
branch
from
a416fbd to
9f6ec3e
Compare
|
PR #18560: Size comparison from ad0f7b8 to 9f6ec3e Increases (4 builds for linux)
Full report (31 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
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.
Problem
When scanning up through the elements in search of a Vendor Reserved
element,
PrepareToReadVendorReserwould callmTlvReader.Next()inside a
while (true)loop. Should theTLVReader::Next()returnan error other than
END_OF_TLVthe loop reader would neither advancenor exit the loop.
Change overview
The change exits the function on any way in a way
that parallels the earlier error checks on TLVReader errors.
Testing
All existing unit tests pass as before. No new unit test was provided for this case.