From: Georgios Androutsopoulos <georgeandrout13@gmail.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <brauner@kernel.org>,
Miguel Ojeda <ojeda@kernel.org>
Cc: "Jan Kara" <jack@suse.cz>, "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>,
linux-fsdevel@vger.kernel.org, rust-for-linux@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Georgios Androutsopoulos" <georgeandrout13@gmail.com>
Subject: [PATCH] rust: file: handle fd table teardown in file descriptor APIs
Date: Sun, 20 Sep 2026 16:01:54 -0400 [thread overview]
Message-ID: <20260920200154.1194983-1-georgeandrout13@gmail.com> (raw)
Several Rust file descriptor APIs rely on `current->files` being
available. However, `exit_files()` clears it while execution may still
continue on the same task.
This affects `LocalFile::fget()` and the
`FileDescriptorReservation` operations that call
`get_unused_fd_flags()`, `fd_install()`, and `put_unused_fd()`.
`FileDescriptorReservation` cannot cross task boundaries, but remaining
on the same task does not guarantee that `current->files` is still
available when these operations are performed.
Guard the affected operations against a missing `current->files`.
`LocalFile::fget()` returns `EBADF` and
`FileDescriptorReservation::get_unused_fd_flags()` returns `EMFILE`.
For the infallible `fd_install()` and drop paths, warn once and avoid
calling the corresponding C helper when the fd table is already gone.
This prevents NULL dereferences through these safe Rust APIs after
`exit_files()`.
Fixes: 851849824bb5 ("rust: file: add Rust abstraction for `struct file`")
Fixes: 5da9857b127e ("rust: file: add `FileDescriptorReservation`")
Closes: https://github.com/Rust-for-Linux/linux/issues/1256
Signed-off-by: Georgios Androutsopoulos <georgeandrout13@gmail.com>
---
rust/kernel/fs/file.rs | 69 ++++++++++++++++++++++++++++++++++++------
1 file changed, 60 insertions(+), 9 deletions(-)
diff --git a/rust/kernel/fs/file.rs b/rust/kernel/fs/file.rs
index 23ee689bd240..559f0985b12c 100644
--- a/rust/kernel/fs/file.rs
+++ b/rust/kernel/fs/file.rs
@@ -260,7 +260,17 @@ impl LocalFile {
/// [`assume_no_fdget_pos`]: LocalFile::assume_no_fdget_pos
#[inline]
pub fn fget(fd: u32) -> Result<ARef<LocalFile>, BadFdError> {
- // SAFETY: FFI call, there are no requirements on `fd`.
+ let current = crate::current!();
+
+ // SAFETY: `current` points to the currently executing task, so it is
+ // valid to read its `files` pointer. The pointer may be null during
+ // task teardown.
+ if unsafe { (*current.as_ptr()).files.is_null() } {
+ return Err(BadFdError);
+ }
+
+ // SAFETY: There are no requirements on `fd`. We checked above that the
+ // current task still has a file descriptor table, which `fget` accesses.
let ptr = ptr::NonNull::new(unsafe { bindings::fget(fd) }).ok_or(BadFdError)?;
// SAFETY: `bindings::fget` created a refcount, and we pass ownership of it to the `ARef`.
@@ -403,7 +413,18 @@ impl FileDescriptorReservation {
/// Creates a new file descriptor reservation.
#[inline]
pub fn get_unused_fd_flags(flags: u32) -> Result<Self> {
- // SAFETY: FFI call, there are no safety requirements on `flags`.
+ let current = crate::current!();
+
+ // SAFETY: `current` points to the currently executing task, so it is
+ // valid to read its `files` pointer. The pointer may be null during
+ // task teardown.
+ if unsafe { (*current.as_ptr()).files.is_null() } {
+ return Err(EMFILE);
+ }
+
+ // SAFETY: There are no safety requirements on `flags`. We checked above
+ // that the current task still has a file descriptor table, which
+ // `get_unused_fd_flags` accesses.
let fd: i32 = unsafe { bindings::get_unused_fd_flags(flags) };
to_result(fd)?;
@@ -421,13 +442,30 @@ pub fn reserved_fd(&self) -> u32 {
/// Commits the reservation.
///
- /// The previously reserved file descriptor is bound to `file`. This method consumes the
- /// [`FileDescriptorReservation`], so it will not be usable after this call.
+ /// The previously reserved file descriptor is bound to `file`. If the current task no longer
+ /// has a file descriptor table, the reservation is abandoned instead. This method consumes the
+ /// [`FileDescriptorReservation`] in either case.
#[inline]
pub fn fd_install(self, file: ARef<File>) {
- // SAFETY: `self.fd` was previously returned by `get_unused_fd_flags`. We have not yet used
- // the fd, so it is still valid, and `current` still refers to the same task, as this type
- // cannot be moved across task boundaries.
+ let current = crate::current!();
+
+ // SAFETY: `current` points to the currently executing task, so it is
+ // valid to read its `files` pointer. The pointer may be null during
+ // task teardown.
+ if unsafe { (*current.as_ptr()).files.is_null() } {
+ crate::pr_warn_once!(
+ "FileDescriptorReservation::fd_install called with current->files == NULL\n"
+ );
+
+ // `put_unused_fd` also requires `current->files` to be valid, so do not run
+ // the reservation's destructor after the current task has lost its fd table.
+ core::mem::forget(self);
+ return;
+ }
+
+ // SAFETY: `self.fd` was previously returned by `get_unused_fd_flags` and has not yet been
+ // used. This type cannot be moved across task boundaries, so `current` still refers to the
+ // same task, and we checked above that it still has an fd table.
//
// Furthermore, the file pointer is guaranteed to own a refcount by its type invariants,
// and we take ownership of that refcount by not running the destructor below.
@@ -446,9 +484,22 @@ pub fn fd_install(self, file: ARef<File>) {
impl Drop for FileDescriptorReservation {
#[inline]
fn drop(&mut self) {
+ let current = crate::current!();
+
+ // SAFETY: `current` points to the currently executing task, so it is
+ // valid to read its `files` pointer. The pointer may be null during
+ // task teardown.
+ if unsafe { (*current.as_ptr()).files.is_null() } {
+ crate::pr_warn_once!(
+ "FileDescriptorReservation dropped with current->files == NULL\n"
+ );
+ return;
+ }
+
// SAFETY: By the type invariants of this type, `self.fd` was previously returned by
- // `get_unused_fd_flags`. We have not yet used the fd, so it is still valid, and `current`
- // still refers to the same task, as this type cannot be moved across task boundaries.
+ // `get_unused_fd_flags` and has not yet been used. This type cannot be moved across task
+ // boundaries, so `current` still refers to the same task, and we checked above that it
+ // still has an fd table.
unsafe { bindings::put_unused_fd(self.fd) };
}
}
--
2.47.3
next reply other threads:[~2026-09-20 20:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-20 20:01 Georgios Androutsopoulos [this message]
2026-09-20 20:48 ` Gary Guo
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=20260920200154.1194983-1-georgeandrout13@gmail.com \
--to=georgeandrout13@gmail.com \
--cc=a.hindborg@kernel.org \
--cc=acourbot@nvidia.com \
--cc=aliceryhl@google.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun@kernel.org \
--cc=brauner@kernel.org \
--cc=dakr@kernel.org \
--cc=daniel.almeida@collabora.com \
--cc=gary@garyguo.net \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tamird@kernel.org \
--cc=tmgross@umich.edu \
--cc=viro@zeniv.linux.org.uk \
--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
all inboxes | Powered by JetHome®