src: Fix genl command payload size calculations. #269
Merged
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
added 2 commits
November 3, 2022 13:06
The user supplied local port isn't used in the "add subflow" command but it is still sent to the kernel if it is non-zero. Make sure there is enough room for it in the payload.
Correct generic netlink command payload buffer size calculations by aligning against the size of the attribute (e.g. sizeof(uint16_t)) as expected instead of size of the attribute size (e.g. sizeof(sizeof(uint16_t))). Payload buffer sizes should be smaller in some cases since netlink attributes are aligned on a 4 byte boundary. For example, the underlying NLA_ALIGN() macro returns 4 when the type is uint16_t, i.e. NLA_ALIGN(sizeof(uint16_t)). Previously, 8 was returned on 64 bit platforms since the NLA_ALIGN() call was incorrectly called like as NLA_ALIGN(sizeof(sizeof(uint16_t))), which boils downs to NLA_ALIGN(size_t).
Pull Request Test Coverage Report for Build 3390929654Details
💛 - Coveralls |
mjmartineau
approved these changes
Nov 4, 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.
Correct generic netlink command payload buffer size calculations by aligning against the size of the attribute (e.g.
sizeof(uint16_t)) as expected instead of size of the attribute size (e.g.sizeof(sizeof(uint16_t))).Payload buffer sizes should now be smaller in some cases since netlink attributes are aligned on a 4 byte boundary. For example, the underlying
NLA_ALIGN()macro returns4when the type isuint16_t, i.e.NLA_ALIGN(sizeof(uint16_t)). Previously,8was returned on 64 bit platforms since theNLA_ALIGN()call was incorrectly called asNLA_ALIGN(sizeof(sizeof(uint16_t))), which boils downs toNLA_ALIGN(size_t).