rust: kernel: use the new try_* methods

ojeda · ojeda · commit 3fd100bca5f4 · 2021-07-01T23:35:22.000+02:00
In preparation for enabling `no_global_oom_handling` for `alloc`,
we need to stop using methods that will disappear when enabling
the configuration option. Instead, we use the new methods
we just added.

Signed-off-by: Miguel Ojeda &lt;ojeda@kernel.org&gt;
diff --git a/rust/kernel/io_buffer.rs b/rust/kernel/io_buffer.rs
@@ -30,8 +30,7 @@ pub trait IoBufferReader {
     /// Returns `EFAULT` if the address does not currently point to mapped, readable memory.
     fn read_all(&mut self) -> Result<Vec<u8>> {
         let mut data = Vec::<u8>::new();
-        data.try_reserve_exact(self.len())?;
-        data.resize(self.len(), 0);
+        data.try_resize(self.len(), 0)?;
 
         // SAFETY: The output buffer is valid as we just allocated it.
         unsafe { self.read_raw(data.as_mut_ptr(), data.len())? };
diff --git a/rust/kernel/module_param.rs b/rust/kernel/module_param.rs
@@ -476,8 +476,7 @@ impl ModuleParam for StringParam {
         arg.and_then(|arg| {
             if slab_available {
                 let mut vec = alloc::vec::Vec::new();
-                vec.try_reserve_exact(arg.len()).ok()?;
-                vec.extend_from_slice(arg);
+                vec.try_extend_from_slice(arg).ok()?;
                 Some(StringParam::Owned(vec))
             } else {
                 Some(StringParam::Ref(arg))
diff --git a/rust/kernel/sysctl.rs b/rust/kernel/sysctl.rs
@@ -156,7 +156,7 @@ impl<T: SysctlStorage> Sysctl<T> {
             },
             unsafe { mem::zeroed() },
         ]
-        .into_boxed_slice();
+        .try_into_boxed_slice()?;
 
         let result = unsafe { bindings::register_sysctl(path.as_char_ptr(), table.as_mut_ptr()) };
         if result.is_null() {
diff --git a/samples/rust/rust_minimal.rs b/samples/rust/rust_minimal.rs
@@ -25,7 +25,7 @@ impl KernelModule for RustMinimal {
         pr_info!("Am I built-in? {}\n", !cfg!(MODULE));
 
         Ok(RustMinimal {
-            message: "on the heap!".to_owned(),
+            message: "on the heap!".try_to_owned()?,
         })
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ impl<T: SysctlStorage> Sysctl<T> {`
`156`	`156`	`},`
`157`	`157`	`unsafe { mem::zeroed() },`
`158`	`158`	`]`
`159`		`- .into_boxed_slice();`
	`159`	`+ .try_into_boxed_slice()?;`
`160`	`160`
`161`	`161`	`let result = unsafe { bindings::register_sysctl(path.as_char_ptr(), table.as_mut_ptr()) };`
`162`	`162`	`if result.is_null() {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ impl KernelModule for RustMinimal {`
`25`	`25`	`pr_info!("Am I built-in? {}\n", !cfg!(MODULE));`
`26`	`26`
`27`	`27`	`Ok(RustMinimal {`
`28`		`- message: "on the heap!".to_owned(),`
	`28`	`+ message: "on the heap!".try_to_owned()?,`
`29`	`29`	`})`
`30`	`30`	`}`
`31`	`31`	`}`