-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[shell] Fix buffer overrun issue NCC-E003350-ABV. #19533
Merged
andy31415
merged 4 commits into
project-chip:master
from
turon:security/NCC-E003350-ABV
Jun 15, 2022
Merged
[shell] Fix buffer overrun issue NCC-E003350-ABV. #19533
andy31415
merged 4 commits into
project-chip:master
from
turon:security/NCC-E003350-ABV
Jun 15, 2022
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
turon
changed the title
Security/ncc e003350 abv
[shell] Fix buffer overrun issue NCC-E003350-ABV.
Jun 13, 2022
pullapprove
bot
requested review from
anush-apple,
arkq,
Byungjoo-Lee,
bzbarsky-apple,
carol-apple,
chrisdecenzo,
chshu,
chulspro,
Damian-Nordic,
dhrishi,
electrocucaracha,
franck-apple,
gjc13,
harimau-qirex,
hawk248,
harsha-rajendran,
isiu-apple,
jelderton,
jepenven-silabs,
jmartinez-silabs,
jtung-apple,
kghost,
kpschoedel,
lazarkov,
LuDuda and
mlepage-google
June 13, 2022 17:21
pullapprove
bot
requested review from
saurabhst,
selissia,
tcarmelveilleux,
tecimovic,
tehampson,
vijs,
vivien-apple,
wbschiller,
woody-apple,
xylophone21 and
yufengwangca
June 13, 2022 17:21
PR #19533: Size comparison from e38e2a6 to eb0f335 Increases (10 builds for cc13x2_26x2, cyw30739, linux, nrfconnect, telink)
Decreases (2 builds for cc13x2_26x2, esp32)
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
turon
force-pushed
the
security/NCC-E003350-ABV
branch
from
June 13, 2022 18:27
eb0f335
to
42d37ed
Compare
msandstedt
approved these changes
Jun 13, 2022
PR #19533: Size comparison from e38e2a6 to 42d37ed Increases (10 builds for cc13x2_26x2, cyw30739, linux, nrfconnect, telink)
Decreases (3 builds for cc13x2_26x2, efr32, esp32)
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
PR #19533: Size comparison from e38e2a6 to cb6d2bc Increases above 0.2%:
Increases (13 builds for cc13x2_26x2, cyw30739, efr32, linux, mbed, nrfconnect, telink)
Decreases (3 builds for cc13x2_26x2, linux, mbed)
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
turon
force-pushed
the
security/NCC-E003350-ABV
branch
from
June 13, 2022 23:38
cb6d2bc
to
3c70ad7
Compare
turon
force-pushed
the
security/NCC-E003350-ABV
branch
from
June 13, 2022 23:43
53cbeb4
to
3c70ad7
Compare
PR #19533: Size comparison from 8cbfd2f to ceb5bcc Increases (9 builds for cc13x2_26x2, cyw30739, linux, telink)
Decreases (3 builds for cc13x2_26x2, esp32, p6)
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
emargolis
approved these changes
Jun 14, 2022
bzbarsky-apple
approved these changes
Jun 14, 2022
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
NCC-E003350-ABV
With specifically crafted input, TokenizeLine() code could write four or eight (pointer size) bytes of 0 after the end of tokens[] array.
While there is a check against max_tokens in the for loop above, it does not take into
account the final nullptr write into tokens[] array.
Change overview
Add guard to prevent overwriting tokens[] array.
Testing
Unit test for tokenizer was removed at some point, not sure why.
Re-added tokenizer unit test and added case for
argc
>max_tokens
.