mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
rust: uaccess: add UserSliceReader::read_slice_partial()
The existing read_slice() method is a wrapper around copy_from_user() and expects the user buffer to be larger than the destination buffer. However, userspace may split up writes in multiple partial operations providing an offset into the destination buffer and a smaller user buffer. In order to support this common case, provide a helper for partial reads. Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Matthew Maurer <mmaurer@google.com> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Miguel Ojeda <ojeda@kernel.org> [ Replace map_or() with let-else; use saturating_add(). - Danilo ] Signed-off-by: Danilo Krummrich <dakr@kernel.org>
This commit is contained in:
@@ -287,6 +287,23 @@ impl UserSliceReader {
|
||||
self.read_raw(out)
|
||||
}
|
||||
|
||||
/// Reads raw data from the user slice into a kernel buffer partially.
|
||||
///
|
||||
/// This is the same as [`Self::read_slice`] but considers the given `offset` into `out` and
|
||||
/// truncates the read to the boundaries of `self` and `out`.
|
||||
///
|
||||
/// On success, returns the number of bytes read.
|
||||
pub fn read_slice_partial(&mut self, out: &mut [u8], offset: usize) -> Result<usize> {
|
||||
let end = offset.saturating_add(self.len()).min(out.len());
|
||||
|
||||
let Some(dst) = out.get_mut(offset..end) else {
|
||||
return Ok(0);
|
||||
};
|
||||
|
||||
self.read_slice(dst)?;
|
||||
Ok(dst.len())
|
||||
}
|
||||
|
||||
/// Reads a value of the specified type.
|
||||
///
|
||||
/// Fails with [`EFAULT`] if the read happens on a bad address, or if the read goes out of
|
||||
|
||||
Reference in New Issue
Block a user