[eclipse-iceoryx#116] Fix race in shm create or open

elfenpiff · Feb 19, 2024 · 3079544 · 3079544
1 parent dfd44b1
commit 3079544
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/doc/release-notes/iceoryx2-unreleased.md b/doc/release-notes/iceoryx2-unreleased.md
@@ -16,6 +16,7 @@
  <!-- NOTE: Add new entries sorted by issue number to minimize the possibility of conflicts when merging. -->
 
  * Fix `open_or_create` race [#108](https://github.com/eclipse-iceoryx/iceoryx2/issues/108)
+ * Fix `CreationMode::OpenOrCreate` in `iceoryx2-bb-posix::SharedMemory` [#116](https://github.com/eclipse-iceoryx/iceoryx2/issues/116)
  * Fix undefined behavior in `spsc::{queue|index_queue}` [#87](https://github.com/eclipse-iceoryx/iceoryx2/issues/87)
 
 ### Refactoring

diff --git a/iceoryx2-bb/posix/src/shared_memory.rs b/iceoryx2-bb/posix/src/shared_memory.rs
@@ -274,7 +274,13 @@ impl SharedMemoryCreationBuilder {
                     }
                     Err(SharedMemoryCreationError::DoesNotExist) => {
                         shm_created = true;
-                        SharedMemory::shm_create(&self.config.name, &self.config)?
+                        match SharedMemory::shm_create(&self.config.name, &self.config) {
+                            Ok(fd) => fd,
+                            Err(SharedMemoryCreationError::AlreadyExist) => {
+                                SharedMemory::shm_open(&self.config.name, &self.config)?
+                            }
+                            Err(e) => return Err(e),
+                        }
                     }
                     Err(v) => return Err(v),
                 }