From: Deborah Brouwer <deborah.brouwer@collabora.com>
To: "Miguel Ojeda" <ojeda@kernel.org>,
"Boqun Feng" <boqun@kernel.org>, "Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <lossin@kernel.org>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Danilo Krummrich" <dakr@kernel.org>,
"Daniel Almeida" <daniel.almeida@collabora.com>,
"Tamir Duberstein" <tamird@kernel.org>,
"Alexandre Courbot" <acourbot@nvidia.com>,
"Onur Özkan" <work@onurozkan.dev>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>
Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org,
Deborah Brouwer <deborah.brouwer@collabora.com>
Subject: [PATCH v2 1/2] rust: uaccess: add UserSliceWriter::clear()
Date: Thu, 15 Oct 2026 11:35:20 -0700 [thread overview]
Message-ID: <20261015-b4-dev_query_fixes-v2-1-e3e6d25050cb@collabora.com> (raw)
In-Reply-To: <20261015-b4-dev_query_fixes-v2-0-e3e6d25050cb@collabora.com>
Add a method to zero the remaining bytes in a UserSliceWriter.
If userspace provides a buffer that is larger than necessary, provide
a method to zero out the remaining UserSliceWriter buffer. This avoids
userspace consuming potentially uninitialized memory and/or mistaking it
for data intentionally provided by the kernel.
Use the #[inline] annotation to make this clear() method available for
inlining outside of the kernel crate.
Since clear_user() is architecturally defined and may be a macro or inline
function, add a rust helper to make clear_user() callable from rust.
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
---
rust/helpers/uaccess.c | 6 ++++++
rust/kernel/uaccess.rs | 24 ++++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/rust/helpers/uaccess.c b/rust/helpers/uaccess.c
index 6e59cc9c665c..e799d9ac9804 100644
--- a/rust/helpers/uaccess.c
+++ b/rust/helpers/uaccess.c
@@ -27,3 +27,9 @@ unsigned long rust_helper__copy_to_user(void __user *to, const void *from, unsig
return _inline_copy_to_user(to, from, n);
}
#endif
+
+__rust_helper unsigned long
+rust_helper_clear_user(void __user *to, unsigned long n)
+{
+ return clear_user(to, n);
+}
diff --git a/rust/kernel/uaccess.rs b/rust/kernel/uaccess.rs
index f1aecda7a90c..8e18285ec44b 100644
--- a/rust/kernel/uaccess.rs
+++ b/rust/kernel/uaccess.rs
@@ -638,6 +638,30 @@ pub fn write<T: AsBytes>(&mut self, value: &T) -> Result {
pub fn write_truncated<T: AsBytes>(&mut self, value: &T) -> Result<usize> {
self.write_slice_partial(value.as_bytes(), 0)
}
+
+ /// Zeros remaining bytes in the userspace buffer.
+ ///
+ /// Fails with [`EFAULT`] if the userspace memory cannot be cleared.
+ #[inline]
+ pub fn clear(&mut self) -> Result {
+ let len = self.length;
+
+ if len == 0 {
+ return Ok(());
+ }
+ // SAFETY: `clear_user` checks the userspace address and range and handles
+ // faults when accessing userspace memory
+ let res = unsafe { bindings::clear_user(self.ptr.as_mut_ptr(), len) };
+
+ if res != 0 {
+ return Err(EFAULT);
+ }
+
+ self.ptr = self.ptr.wrapping_byte_add(len);
+ self.length = 0;
+
+ Ok(())
+ }
}
/// Reads a nul-terminated string into `dst` and returns the length.
--
2.56.0
next prev parent reply other threads:[~2026-10-15 18:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-15 18:35 [PATCH v2 0/2] drm/tyr: allow mismatched buffers for dev_query Deborah Brouwer
2026-10-15 18:35 ` Deborah Brouwer [this message]
2026-10-15 18:35 ` [PATCH v2 2/2] drm/tyr: allow userspace buffers to be mismatched Deborah Brouwer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261015-b4-dev_query_fixes-v2-1-e3e6d25050cb@collabora.com \
--to=deborah.brouwer@collabora.com \
--cc=a.hindborg@kernel.org \
--cc=acourbot@nvidia.com \
--cc=airlied@gmail.com \
--cc=aliceryhl@google.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun@kernel.org \
--cc=dakr@kernel.org \
--cc=daniel.almeida@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=simona@ffwll.ch \
--cc=tamird@kernel.org \
--cc=tmgross@umich.edu \
--cc=work@onurozkan.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox