Fix #1222, protect if OS_FDGetInfo called on socket #1223
Merged
Conversation
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
Datagram sockets do not have a name_entry, it is set NULL. If the user calls OS_FDGetInfo() on this type of ID, it will pass the first test, so this needs to be checked for non-NULL.
jphickey
added
the
CCB:Ready
skliper
approved these changes
Feb 23, 2022
Contributor
skliper
left a comment
skliper
left a comment
There was a problem hiding this comment.
Strange the name wasn't used before. Approved.
Contributor
Author
Yeah, I was surprised by that too. Every existing caller was passing |
astrogeco
added
CCB:Approved
Contributor
|
CCB:2022-02-23 APPROVED
|
|
Changes correct the issue I was having. |
astrogeco
added a commit
that referenced
this pull request
Feb 25, 2022
Part of IC:Caelum+dev4, nasa/cFS#432 **Includes** PR #1215 - Resolve UT uninitialized variable warnings PR #1219 - Add ut_assert to doxygen and fix warnings PR #1223 - Protect if OS_FDGetInfo called on socket
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Feb 25, 2022
**Combines** - nasa/cFE#2061, v7.0.0-rc4+dev80 - nasa/osal#1226, v6.0.0-rc4+dev42 - nasa/PSP#326, v1.6.0-rc4+dev14 *Apps* - ci_lab v2.5.0-rc4+dev10 - sample_app v1.3.0-rc4+dev9 - sch_lab v2.5.0-rc4+dev16 - to_lab v2.5.0-rc4+dev9 *Libs* - sample_lib v1.3.0-rc4+dev9 *Tools* - cFS-GroundSystem v3.0.0-rc4+dev12 - elf2cfetbl v3.3.0-rc4+dev11 - tblCRCTool v1.3.0-rc4+dev7 **Includes** - nasa/cFE#2048, Add CFE_ES_CreateChildTask default handler - nasa/osal#1215, Resolve UT uninitialized variable warnings - nasa/osal#1219, Add ut_assert to doxygen and fix warnings - nasa/osal#1223, protect if OS_FDGetInfo called on socket - nasa/cFE#2056, Missing SB include for v2 msgid - nasa/cFE#2052, Resolve doxygen doc warnings and enforce in CI *Apply Header Guard Standard* - nasa/PSP#322 - nasa/ci_lab#103 - nasa/to_lab#114 - nasa/sch_lab#107 - nasa/sample_lib#74 - nasa/elf2cfetbl#100 - nasa/cFS-GroundSystem#205 *Remove explicit filename doxygen comments* - nasa/cFE#2050 - nasa/osal#1217 - nasa/PSP#324 - nasa/sample_lib#76 - nasa/tblCRCTool#62 - nasa/elf2cfetbl#102
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Feb 25, 2022
**Combines** - nasa/cFE#2061, v7.0.0-rc4+dev80 - nasa/osal#1226, v6.0.0-rc4+dev42 - nasa/PSP#326, v1.6.0-rc4+dev14 *Apps* - ci_lab v2.5.0-rc4+dev10 - sample_app v1.3.0-rc4+dev9 - sch_lab v2.5.0-rc4+dev16 - to_lab v2.5.0-rc4+dev9 *Libs* - sample_lib v1.3.0-rc4+dev9 *Tools* - cFS-GroundSystem v3.0.0-rc4+dev12 - elf2cfetbl v3.3.0-rc4+dev11 - tblCRCTool v1.3.0-rc4+dev7 **Includes** - nasa/cFE#2048, Add CFE_ES_CreateChildTask default handler - nasa/osal#1215, Resolve UT uninitialized variable warnings - nasa/osal#1219, Add ut_assert to doxygen and fix warnings - nasa/osal#1223, protect if OS_FDGetInfo called on socket - nasa/cFE#2056, Missing SB include for v2 msgid - nasa/cFE#2052, Resolve doxygen doc warnings and enforce in CI *Apply Header Guard Standard* - nasa/PSP#322 - nasa/ci_lab#103 - nasa/to_lab#114 - nasa/sch_lab#107 - nasa/sample_lib#74 - nasa/elf2cfetbl#100 - nasa/cFS-GroundSystem#205 *Remove explicit filename doxygen comments* - nasa/cFE#2050 - nasa/osal#1217 - nasa/PSP#324 - nasa/sample_lib#76 - nasa/tblCRCTool#62 - nasa/elf2cfetbl#102
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Feb 25, 2022
**Combines** - nasa/cFE#2061, v7.0.0-rc4+dev80 - nasa/osal#1226, v6.0.0-rc4+dev42 - nasa/PSP#326, v1.6.0-rc4+dev14 *Apps* - ci_lab v2.5.0-rc4+dev10 - sample_app v1.3.0-rc4+dev9 - sch_lab v2.5.0-rc4+dev16 - to_lab v2.5.0-rc4+dev9 *Libs* - sample_lib v1.3.0-rc4+dev9 *Tools* - cFS-GroundSystem v3.0.0-rc4+dev12 - elf2cfetbl v3.3.0-rc4+dev11 - tblCRCTool v1.3.0-rc4+dev7 **Includes** - nasa/cFE#2048, Add CFE_ES_CreateChildTask default handler - nasa/osal#1215, Resolve UT uninitialized variable warnings - nasa/osal#1219, Add ut_assert to doxygen and fix warnings - nasa/osal#1223, protect if OS_FDGetInfo called on socket - nasa/cFE#2056, Missing SB include for v2 msgid - nasa/cFE#2052, Resolve doxygen doc warnings and enforce in CI *Apply Header Guard Standard* - nasa/PSP#322 - nasa/ci_lab#103 - nasa/to_lab#114 - nasa/sch_lab#107 - nasa/sample_lib#74 - nasa/elf2cfetbl#100 - nasa/cFS-GroundSystem#205 *Remove explicit filename doxygen comments* - nasa/cFE#2050 - nasa/osal#1217 - nasa/PSP#324 - nasa/sample_lib#76 - nasa/tblCRCTool#62 - nasa/elf2cfetbl#102 Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com>
jphickey
pushed a commit
to jphickey/osal
that referenced
this pull request
Aug 10, 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.
Describe the contribution
Datagram sockets do not have a name_entry, it is set NULL. If the user calls OS_FDGetInfo() on this type of ID, it will
pass the first test, so this needs to be checked for non-NULL.
Fixes #1222
Testing performed
Build and sanity check OSAL
Run all tests
Confirm coverage test is exercising the new check
Expected behavior changes
Calling OS_FDGetInfo on a datagram socket returns an empty string in the Path field, it does not segfault.
System(s) tested on
Ubuntu
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.