[PATCH] rust: check type of `$ptr` in `container_of!`
From: Tamir Duberstein
Date: Fri Apr 11 2025 - 10:32:38 EST
Add a compile-time check that `*$ptr` is of the type of `$type->$($f)*`.
Suggested-by: Alice Ryhl <aliceryhl@xxxxxxxxxx>
Link: https://lore.kernel.org/all/CAH5fLgh6gmqGBhPMi2SKn7mCmMWfOSiS0WP5wBuGPYh9ZTAiww@xxxxxxxxxxxxxx/
Signed-off-by: Tamir Duberstein <tamird@xxxxxxxxx>
---
rust/kernel/lib.rs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index 1df11156302a..da9e36aa7967 100644
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -200,7 +200,10 @@ fn panic(info: &core::panic::PanicInfo<'_>) -> ! {
macro_rules! container_of {
($ptr:expr, $type:ty, $($f:tt)*) => {{
let offset: usize = ::core::mem::offset_of!($type, $($f)*);
- $ptr.byte_sub(offset).cast::<$type>()
+ let container = $ptr.byte_sub(offset).cast::<$type>();
+ fn assert_same_type<T>(_: T, _: T) {}
+ assert_same_type($ptr, ::core::mem::addr_of!((*container).$($f)*).cast_mut());
+ container
}}
}
---
base-commit: 0af2f6be1b4281385b618cb86ad946eded089ac8
change-id: 20250411-b4-container-of-type-check-06af1c204f59
prerequisite-change-id: 20250409-container-of-mutness-b153dab4388d:v1
prerequisite-patch-id: 53d5889db599267f87642bb0ae3063c29bc24863
Best regards,
--
Tamir Duberstein <tamird@xxxxxxxxx>