[16360] Protect from uncaught exception during SHM Segment creation. #3293

jsan-rt · 2023-02-13T14:10:56Z

This PR adds protection for possible boost::interprocess::interprocess_exception that may be thrown during the execution of SharedMemSegment::compute_per_allocation_extra_size

Description

@Mergifyio backport 2.9.x 2.8.x 2.6.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.
Changes are ABI compatible.
Changes are API compatible.
[N/A] Documentation builds and tests pass locally.
[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

Check contributor checklist is correct.
Check CI results: changes do not issue any warning.
Check CI results: failing tests are unrelated with the changes.

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

…rows Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

Mario-DL

The Regression Test and the fix work as expected. Just a couple of minor comments

src/cpp/rtps/transport/shared_mem/SharedMemManager.hpp

test/unittest/rtps/DataSharing/CMakeLists.txt

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

Mario-DL

LGTM

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

Mario-DL

LGTM with green CI

Mario-DL · 2023-02-15T10:41:47Z

@richiprosima please test this

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

Mario-DL · 2023-02-15T12:17:18Z

@richiprosima please test uncrustify

Mario-DL · 2023-02-15T12:18:42Z

@richiprosima please test windows

Mario-DL · 2023-02-16T06:33:11Z

@richiprosima please test windows

jsan-rt · 2023-02-16T09:03:43Z

@richiprosima please test windows

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

jsan-rt · 2023-02-20T08:40:41Z

@richiprosima Please test windows

Mario-DL

LGTM with green CI

jsan-rt · 2023-02-20T14:17:17Z

@richiprosima please test linux

jsan-rt · 2023-02-20T14:17:28Z

@richiprosima please test mac

Mario-DL

LGTM

EduPonz · 2023-02-21T08:14:19Z

@richiprosima please test mac discovery-server

EduPonz · 2023-02-21T08:17:40Z

@richiprosima please discovery-server

EduPonz · 2023-02-21T08:19:13Z

@richiprosima please test discovery-server

jsan-rt · 2023-02-28T06:28:10Z

@Mergifyio backport 2.9.x 2.8.x 2.6.x

mergify · 2023-02-28T06:28:25Z

backport 2.9.x 2.8.x 2.6.x

✅ Backports have been created

#3331 [16360] Protect from uncaught exception during SHM Segment creation. (backport #3293) has been created for branch 2.9.x
#3332 [16360] Protect from uncaught exception during SHM Segment creation. (backport #3293) has been created for branch 2.8.x
#3333 [16360] Protect from uncaught exception during SHM Segment creation. (backport #3293) has been created for branch 2.6.x

* Added regression test Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fix Segfault when SharedSegment::compute_per_allocation_extra_size throws Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> * Refs #16360: Added comments and remove some unneeded code Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Applied suggestions Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Uncrustify Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fixed Windows warnings Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Added NOMINMAX flag to test Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> Co-authored-by: Eduardo Ponz <eduardoponz@eprosima.com> (cherry picked from commit 72d1ba1)

* Added regression test Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fix Segfault when SharedSegment::compute_per_allocation_extra_size throws Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> * Refs #16360: Added comments and remove some unneeded code Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Applied suggestions Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Uncrustify Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fixed Windows warnings Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Added NOMINMAX flag to test Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> Co-authored-by: Eduardo Ponz <eduardoponz@eprosima.com> (cherry picked from commit 72d1ba1) # Conflicts: # src/cpp/rtps/DataSharing/WriterPool.hpp

* Protect from uncaught exception during SHM Segment creation (#3293) * Added regression test Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fix Segfault when SharedSegment::compute_per_allocation_extra_size throws Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> * Refs #16360: Added comments and remove some unneeded code Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Applied suggestions Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Uncrustify Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fixed Windows warnings Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Added NOMINMAX flag to test Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> Co-authored-by: Eduardo Ponz <eduardoponz@eprosima.com> (cherry picked from commit 72d1ba1) # Conflicts: # src/cpp/rtps/DataSharing/WriterPool.hpp * Fixed conflicts Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Removed incompatible changes Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Co-authored-by: jsantiago-eProsima <90755661+jsantiago-eProsima@users.noreply.github.com> Co-authored-by: Javier Santiago <javiersantiago@eprosima.com>

…#3293) (#3333) * Protect from uncaught exception during SHM Segment creation (#3293) * Added regression test Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fix Segfault when SharedSegment::compute_per_allocation_extra_size throws Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> * Refs #16360: Added comments and remove some unneeded code Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Applied suggestions Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Uncrustify Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fixed Windows warnings Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Added NOMINMAX flag to test Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> Co-authored-by: Eduardo Ponz <eduardoponz@eprosima.com> (cherry picked from commit 72d1ba1) # Conflicts: # src/cpp/rtps/DataSharing/WriterPool.hpp * Fixed conflicts Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fixed log macro name Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fixed log macro name Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Refs #16360: Please uncrustify Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> * Modified SharedMemSegment mock to be in line with 2.6.x version of the same class Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com> Co-authored-by: jsantiago-eProsima <90755661+jsantiago-eProsima@users.noreply.github.com> Co-authored-by: Javier Santiago <javiersantiago@eprosima.com> Co-authored-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Added regression test Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fix Segfault when SharedSegment::compute_per_allocation_extra_size throws Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> * Refs #16360: Added comments and remove some unneeded code Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Applied suggestions Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Uncrustify Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Fixed Windows warnings Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> * Added NOMINMAX flag to test Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> --------- Signed-off-by: Javier Santiago <javiersantiago@eprosima.com> Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com> Co-authored-by: Eduardo Ponz <eduardoponz@eprosima.com>

jsan-rt and others added 3 commits February 13, 2023 14:17

Added regression test

947ada5

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

Fix Segfault when SharedSegment::compute_per_allocation_extra_size th…

9c65870

…rows Signed-off-by: Eduardo Ponz <eduardoponz@eprosima.com>

Refs #16360: Added comments and remove some unneeded code

a599f3a

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

Mario-DL reviewed Feb 15, 2023

View reviewed changes

src/cpp/rtps/transport/shared_mem/SharedMemManager.hpp Outdated Show resolved Hide resolved

test/unittest/rtps/DataSharing/CMakeLists.txt Outdated Show resolved Hide resolved

Applied suggestions

962a507

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

Mario-DL previously approved these changes Feb 15, 2023

View reviewed changes

Uncrustify

4b00fca

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

jsan-rt dismissed Mario-DL’s stale review via 4b00fca February 15, 2023 10:36

Mario-DL previously approved these changes Feb 15, 2023

View reviewed changes

Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. labels Feb 15, 2023

Mario-DL added the ci-pending PR which CI is running label Feb 15, 2023

Fixed Windows warnings

c87b9cc

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

jsan-rt dismissed Mario-DL’s stale review via c87b9cc February 15, 2023 12:14

Added NOMINMAX flag to test

2fba8e4

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

jsan-rt force-pushed the bugfix/catch_permission_denied_datasharing branch from de1cd4d to 2fba8e4 Compare February 20, 2023 08:40

jsan-rt removed the ci-pending PR which CI is running label Feb 20, 2023

Mario-DL approved these changes Feb 20, 2023

View reviewed changes

jsan-rt added the ci-pending PR which CI is running label Feb 20, 2023

Mario-DL approved these changes Feb 21, 2023

View reviewed changes

Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Feb 21, 2023

EduPonz added ci-pending PR which CI is running and removed ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. labels Feb 21, 2023

Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Feb 23, 2023

MiguelCompany merged commit 72d1ba1 into master Feb 24, 2023

MiguelCompany deleted the bugfix/catch_permission_denied_datasharing branch February 24, 2023 06:41

jsan-rt mentioned this pull request Feb 25, 2023

[17350] Removed Boost singleton references from mock #3328

Merged

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[16360] Protect from uncaught exception during SHM Segment creation. #3293

[16360] Protect from uncaught exception during SHM Segment creation. #3293

jsan-rt commented Feb 13, 2023 •

edited by Mario-DL

Loading

Mario-DL left a comment

Mario-DL left a comment

Mario-DL left a comment •

edited

Loading

Mario-DL commented Feb 15, 2023

Mario-DL commented Feb 15, 2023 •

edited

Loading

Mario-DL commented Feb 15, 2023

Mario-DL commented Feb 16, 2023

jsan-rt commented Feb 16, 2023

jsan-rt commented Feb 20, 2023

Mario-DL left a comment •

edited

Loading

jsan-rt commented Feb 20, 2023

jsan-rt commented Feb 20, 2023

Mario-DL left a comment

EduPonz commented Feb 21, 2023

EduPonz commented Feb 21, 2023

EduPonz commented Feb 21, 2023

jsan-rt commented Feb 28, 2023

mergify bot commented Feb 28, 2023 •

edited

Loading

[16360] Protect from uncaught exception during SHM Segment creation. #3293

[16360] Protect from uncaught exception during SHM Segment creation. #3293

Conversation

jsan-rt commented Feb 13, 2023 • edited by Mario-DL Loading

Description

Contributor Checklist

Reviewer Checklist

Mario-DL left a comment

Choose a reason for hiding this comment

Mario-DL left a comment

Choose a reason for hiding this comment

Mario-DL left a comment • edited Loading

Choose a reason for hiding this comment

Mario-DL commented Feb 15, 2023

Mario-DL commented Feb 15, 2023 • edited Loading

Mario-DL commented Feb 15, 2023

Mario-DL commented Feb 16, 2023

jsan-rt commented Feb 16, 2023

jsan-rt commented Feb 20, 2023

Mario-DL left a comment • edited Loading

Choose a reason for hiding this comment

jsan-rt commented Feb 20, 2023

jsan-rt commented Feb 20, 2023

Mario-DL left a comment

Choose a reason for hiding this comment

EduPonz commented Feb 21, 2023

EduPonz commented Feb 21, 2023

EduPonz commented Feb 21, 2023

jsan-rt commented Feb 28, 2023

mergify bot commented Feb 28, 2023 • edited Loading

✅ Backports have been created

jsan-rt commented Feb 13, 2023 •

edited by Mario-DL

Loading

Mario-DL left a comment •

edited

Loading

Mario-DL commented Feb 15, 2023 •

edited

Loading

Mario-DL left a comment •

edited

Loading

mergify bot commented Feb 28, 2023 •

edited

Loading