Skip to content
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

[22438] Arithmetic overflow in fragment size calculations (backport #5464) #5514

Open
wants to merge 1 commit into
base: 2.10.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 18, 2024

Description

This PR fixes an overflow in the WriterHistory and BaseWriter that occurred when the maximum message size was insufficient to accommodate the message's inherent headers.

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5464 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 18, 2024
Copy link
Contributor Author

mergify bot commented Dec 18, 2024

Cherry-pick of bfc5a53 has failed:

On branch mergify/bp/2.10.x/pr-5464
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit bfc5a530.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/history/WriterHistory.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	new file:   test/unittest/rtps/history/WriterHistoryTests.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/cpp/rtps/writer/BaseWriter.cpp
	both modified:   test/blackbox/common/DDSBlackboxTestsListeners.cpp
	both modified:   test/unittest/rtps/history/CMakeLists.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@MiguelCompany MiguelCompany added this to the v2.10.7 milestone Dec 18, 2024
* Tests arithmetic overflow in fragment size calculations

Signed-off-by: Eugenio Collado <[email protected]>

* Refs #21814. Fix code in BaseWriter.cpp.

Signed-off-by: Miguel Company <[email protected]>

* Fix corner case overhead==max_data_size

Signed-off-by: Eugenio Collado <[email protected]>

* Refs #21814. Fix code in WriterHistory.cpp.

Signed-off-by: Miguel Company <[email protected]>

* Fix corner case overhead==final_high_mark_for_frag

Signed-off-by: Eugenio Collado <[email protected]>

* Uncrustify

Signed-off-by: Eugenio Collado <[email protected]>

* Fix log error message

Signed-off-by: Eugenio Collado <[email protected]>

* Fix test fragments not been dropped

Signed-off-by: Eugenio Collado <[email protected]>

* Fix corner case RTPSParticipantImpl max_data_size < overhead

Signed-off-by: Eugenio Collado <[email protected]>

* Test refactor for windows compilation

Signed-off-by: Eugenio Collado <[email protected]>

* Fix blackbox test

Signed-off-by: Eugenio Collado <[email protected]>

* Applied review suggestions

Signed-off-by: EugenioCollado <[email protected]>

---------

Signed-off-by: Eugenio Collado <[email protected]>
Signed-off-by: Miguel Company <[email protected]>
Signed-off-by: EugenioCollado <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit bfc5a53)
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.10.x/pr-5464 branch from 0f341bc to 2da4ffc Compare December 20, 2024 09:07
@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Dec 20, 2024
@EugenioCollado EugenioCollado requested review from richiprosima and removed request for richiprosima December 20, 2024 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants