[PATCH 1/2] rust: sync: require `Send` and `Sync` for `Backend::State`
From: Benno Lossin
Date: Tue Sep 03 2024 - 05:17:40 EST
`Lock<T, B>` implements `Send` and `Sync` when `T` is `Send` or `Sync`
respectively. Since this does not depend on `B`, creating a `Lock` that
is `Send` and `Sync`, but with a `!Sync` or `!Send` state is possible.
This is a soundness issue, thus add the bounds to the respective impls.
Signed-off-by: Benno Lossin <benno.lossin@xxxxxxxxx>
---
rust/kernel/sync/lock.rs | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs
index f6c34ca4d819..e73ac9d97b29 100644
--- a/rust/kernel/sync/lock.rs
+++ b/rust/kernel/sync/lock.rs
@@ -97,12 +97,23 @@ pub struct Lock<T: ?Sized, B: Backend> {
pub(crate) data: UnsafeCell<T>,
}
-// SAFETY: `Lock` can be transferred across thread boundaries iff the data it protects can.
-unsafe impl<T: ?Sized + Send, B: Backend> Send for Lock<T, B> {}
+// SAFETY: `Lock` can be transferred across thread boundaries iff the data it protects and the
+// backend state can.
+unsafe impl<T: ?Sized, B: Backend> Send for Lock<T, B>
+where
+ T: Send,
+ B::State: Send,
+{
+}
// SAFETY: `Lock` serialises the interior mutability it provides, so it is `Sync` as long as the
-// data it protects is `Send`.
-unsafe impl<T: ?Sized + Send, B: Backend> Sync for Lock<T, B> {}
+// data it protects is `Send` and the backend state can be shared.
+unsafe impl<T: ?Sized + Send, B: Backend> Sync for Lock<T, B>
+where
+ T: Send,
+ B::State: Sync,
+{
+}
impl<T, B: Backend> Lock<T, B> {
/// Constructs a new lock initialiser.
base-commit: a335e95914046c6bed45c0d17cabcd483682cf5e
--
2.46.0