From 1a7c868e72db0493ed07c35fac320ba52630aaac Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 16 Oct 2024 12:56:16 +0200 Subject: [PATCH 1/2] Soundness fix: ensure the CriticalSection token is not Send/Sync so it can only be used in the thread that acquired it. --- src/lib.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index 215c066..3c05de8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,6 +16,10 @@ pub use self::mutex::Mutex; #[derive(Clone, Copy, Debug)] pub struct CriticalSection<'cs> { _private: PhantomData<&'cs ()>, + + // Prevent CriticalSection from being Send or Sync + // https://github.com/rust-embedded/critical-section/issues/55 + _not_send_sync: PhantomData<*mut ()>, } impl<'cs> CriticalSection<'cs> { @@ -40,6 +44,7 @@ impl<'cs> CriticalSection<'cs> { pub unsafe fn new() -> Self { CriticalSection { _private: PhantomData, + _not_send_sync: PhantomData, } } } From 7f8536c26f8daf2698b98756134c34c8cb314719 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Wed, 16 Oct 2024 12:57:02 +0200 Subject: [PATCH 2/2] Release v1.2.0 --- CHANGELOG.md | 11 +++++++++-- Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38628d7..319f4c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 No unreleased changes yet +## [v1.2.0] - 2024-10-16 + +- Soundness fix: ensure the `CriticalSection` token is not `Send` or `Sync`, so that it can only be used in the thread that acquired it. [#55](https://github.com/rust-embedded/critical-section/issues/55) +- Soundness fix: Fix aliasing `&mut` in the `std` implementation. [#46](https://github.com/rust-embedded/critical-section/pull/46) +- Fix build with `restore-state-usize`. [#50](https://github.com/rust-embedded/critical-section/pull/50) + ## [v1.1.3] - 2024-08-22 - Added option to use a `usize` sized restore state @@ -123,8 +129,9 @@ If you're seeing a linker error like `undefined symbol: _critical_section_1_0_ac - First release -[Unreleased]: https://github.com/rust-embedded/critical-section/compare/v1.1.3...HEAD -[v1.1.2]: https://github.com/rust-embedded/critical-section/compare/v1.1.2...v1.1.3 +[Unreleased]: https://github.com/rust-embedded/critical-section/compare/v1.2.0...HEAD +[v1.2.0]: https://github.com/rust-embedded/critical-section/compare/v1.1.3...v1.2.0 +[v1.1.3]: https://github.com/rust-embedded/critical-section/compare/v1.1.2...v1.1.3 [v1.1.2]: https://github.com/rust-embedded/critical-section/compare/v1.1.1...v1.1.2 [v1.1.1]: https://github.com/rust-embedded/critical-section/compare/v1.1.0...v1.1.1 [v1.1.0]: https://github.com/rust-embedded/critical-section/compare/v1.0.0...v1.1.0 diff --git a/Cargo.toml b/Cargo.toml index 387d2a2..ce12955 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "critical-section" -version = "1.1.3" +version = "1.2.0" edition = "2018" description = "Cross-platform critical section" repository = "https://github.com/rust-embedded/critical-section"