[core] Fix alignment issues in cmsg header managment (#2830)#2844
Merged
maxsharabayko merged 6 commits intoHaivision:masterfrom Jan 12, 2024
Merged
[core] Fix alignment issues in cmsg header managment (#2830)#2844maxsharabayko merged 6 commits intoHaivision:masterfrom
maxsharabayko merged 6 commits intoHaivision:masterfrom
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
ethouris
reviewed
Jan 11, 2024
ethouris
reviewed
Jan 11, 2024
ethouris
reviewed
Jan 11, 2024
| // the handshake and then addressed when sending during connection. | ||
| mh.msg_control = (m_acCmsgRecvBuffer); | ||
| mh.msg_controllen = sizeof m_acCmsgRecvBuffer; | ||
| mh.msg_control = mh_crtl_buf; |
Collaborator
There was a problem hiding this comment.
Maintain parentheses. This is a language-transparent marker pointing out that this variable will be used for writing.
ethouris
reviewed
Jan 11, 2024
| mh.msg_control = (m_acCmsgRecvBuffer); | ||
| mh.msg_controllen = sizeof m_acCmsgRecvBuffer; | ||
| mh.msg_control = mh_crtl_buf; | ||
| mh.msg_controllen = (sizeof(mh_crtl_buf)); |
Collaborator
There was a problem hiding this comment.
Parentheses are not required here at all. Just sizeof mh_ctrl_buf.
ethouris
reviewed
Jan 11, 2024
ethouris
reviewed
Jan 11, 2024
ethouris
reviewed
Jan 11, 2024
ethouris
reviewed
Jan 11, 2024
Collaborator
ethouris
left a comment
ethouris
left a comment
There was a problem hiding this comment.
Reviewed; some things below require explanation.
ethouris
approved these changes
Jan 11, 2024
maxsharabayko
approved these changes
Jan 12, 2024
maxsharabayko
added
Type: Bug
Closed
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
4 participants
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.
We used to directly cast the result of CMSG_DATA to in_pktinfo or in6_pktinfo. As stated in CMSG_FIRSTHDR manpage, alignement of the return value of this method is not guaranteed, and a memcpy should be done to manipulate it.
For some reason, the use of the mutable m_acCmsgRecvBuffer and m_acCmsgSendBuffer also caused alignemnt issues when using it as msg_control field of msghdr. Declaring a new char each time instead of using the mutable one solved this issue.