From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 470C5346FBE for ; Sat, 10 Jan 2026 15:09:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768057761; cv=none; b=kyArsCbQEtddWl0pA3kahazeseZ6lb30qJ4o09kv6BCSD0/at5ZeXg7ROUEb1MFstDs3MkLFmo8ksB8mrlcDYGVnxrl5NRQDLWaB9KIGM+XmSdHNLwBreCpI2tNhZiaD4MWPeu7f8JUMAHfgaSwilPF8KkuqdhQI0jVSBOwZf9E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768057761; c=relaxed/simple; bh=pObMsqQ3xkzVkZ3cfdHVrZzRa8fls1Dett+yl59GTWk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i7XN7oIoW1BX3BGqc16x4r7bDY0Y8ZHzIAWqBkR+F2l3+myVtlMJTRvDqrwzY/EsyF2/acL5VwGrzDfjlriOjTlBR0XTPp8zAYyAGHPuqxEWpsjJrtxNpFfsgvjINGOPuuzcNB9koAv224OV80bNLCeDmfCBxJ9WM2EIu8eDmCw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NNkkbRo6; arc=none smtp.client-ip=209.85.167.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NNkkbRo6" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-59b7bb3b913so2876928e87.1 for ; Sat, 10 Jan 2026 07:09:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768057758; x=1768662558; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=POe8fbaXk5saKFPceg6wmKUDp4vPexwP90O+JTHpGXU=; b=NNkkbRo6aZbyc06RlLk1lH6ZXqkmowM+l54L2ZcMX1EWCqGBDSx/t1ut8jyp4lLRYe ZzCPCSWbF/6nHNtqketNdBc2Rs4p7n2NxODS9mhEDRzCdo1MGhtrdqPwD8DbgL6uNHEp +JzoXSp0L3AE/dwcjuAhG1QNca7EFz+yoKTogTRFxzd/Z0EO6xaKOdwtlWqLfGlbCMpW UUCObZsH7+dk9tGaTqseR95BAjGbUHC91fGzO9zB+oZDtqWirktvirSpXpWfjTmF2INb 9xrWxT/xIyI+hdRoz5Bj4Ty9XT5xytQNk0sMK2V87pfWGaAh6ZSnaZLe9NdgOtsBNEUc YHuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768057758; x=1768662558; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=POe8fbaXk5saKFPceg6wmKUDp4vPexwP90O+JTHpGXU=; b=qTAsWCureYhxmKg5liYz2GIf68d4DtQzwT9EBwE/bd0z+tAR7ajnv1uCcKr0VNZrJN B1Frrsy81Hk32lMDdu/I1HQEj95TngjLpxWdnZiEbJBXDpJ+rILmrNIu8/H0X6qae3qY tFXn+pExh2kX2r8g/eOu0/f8xAXFUAaUw+G0n8v/LRXtFekNH3FBOsH3m6gTZVTiTB4h gNcJ7vjO/EsqtNIJgF0chDHrY/YTShwcYb5794pCRsiOL+khZbwbST9Y0LkHuv8fRh9N iQhuwddwTX6CBOdAm05+TopPlt0PO5n56etxeqSJNnHjZ7bLXjSgBskMvecK9uFhtXdr 4r6A== X-Forwarded-Encrypted: i=1; AJvYcCUTr/Ul6eDnl+gf0BbJozvH2ReoeSKHMTVE2w+r5926iz0+skA+JjrbSZM22K64ULkQtW4Y1501nFRdMm04@vger.kernel.org X-Gm-Message-State: AOJu0Yzho6dqs0/IkhBo8YAefvCfriXXD2fonbiobCDYr3+J96oMYhQf pOevAl7FDlRLPR6rGuISLAwFttPMay0/tLMoX58IK6bdKcOcnGu3paie X-Gm-Gg: AY/fxX7SPg1/NFP6TE7005a5hNyYW9ItsEKsFJ0m+eS5yVOGJpgeFObO1hxsw755mEf OYabOR8+nYqQHNeR579MNULtt6mOc6og+T8+X9qQYy2ZbdqQGFSjT/Dy0T3Egz2L3RmJEKkAbQm QRlGLyJkrleAGv0SJT74GlKgU2Fd7ZZ3fLFsCE2N3KEw0liJeO73tfNdZjKr8nVYMY+4UQEa+Kj p7cvy4J+tVmsDKLjyY3PmBGzvOyzNbToQHK5qZygdecDUC5dZCbOOuxiecncYkWK1fsqoL8TSoh ah5DRiQBxpWImkTe683E5gZpja3Qq7CZxKsNQ67TjK/hk7Gb/ssxQ0E918dKV9/h1g/QXamBY3L /LMWshWVQi9l5VKDdS/fo0d+7//xhEY2GZlSlvMamkdBywvw304RUDLi4C0ppY8CYUl1Ni1rXwH I5MouEVSSaOX3opiBUt5jJC57kAsg0iselcaKLx1oNb3vHsqUmuu6t/AEYk0073vM0SrVNn7SV X-Google-Smtp-Source: AGHT+IFNLBJQ01WunUBd430d8tTEifFvMoI0XyeN6DoOTINO7+ijuLgcerNFWqW0B99vr+losLUPpw== X-Received: by 2002:a05:6512:2117:b0:59b:7319:1178 with SMTP id 2adb3069b0e04-59b7319121bmr2477799e87.18.1768057758332; Sat, 10 Jan 2026 07:09:18 -0800 (PST) Received: from LT-5CG5341NQ4.nordic.imtech.com (37-33-148-7.bb.dnainternet.fi. [37.33.148.7]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59b75543a64sm2137059e87.49.2026.01.10.07.09.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Jan 2026 07:09:17 -0800 (PST) From: Kari Argillander Date: Sat, 10 Jan 2026 17:08:03 +0200 Subject: [PATCH RFC v3 05/15] rust: drm: fix missing owner in file_operations Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260110-this_module_fix-v3-5-97a3d9c14e8b@gmail.com> References: <20260110-this_module_fix-v3-0-97a3d9c14e8b@gmail.com> In-Reply-To: <20260110-this_module_fix-v3-0-97a3d9c14e8b@gmail.com> To: Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Alexandre Courbot Cc: Greg Kroah-Hartman , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , Aaron Tomlin , Kari Argillander X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1768057742; l=4166; i=kari.argillander@gmail.com; s=20251219; h=from:subject:message-id; bh=pObMsqQ3xkzVkZ3cfdHVrZzRa8fls1Dett+yl59GTWk=; b=7zLe5lryXy/9T6T96fAXZ7YJeKt8qHxw069TB58wLHh6FQK1Lc+lOPi4kQLZ71zfyr/Y1nIP9 SPGhEma2/P/CfpNojS+bq8ykYv3iAGUyS47NiSESO5YlCZu6vHqAVfF X-Developer-Key: i=kari.argillander@gmail.com; a=ed25519; pk=RwSxyhTpE3z4sywdDbIkC3q33ZQLNyhYWxT44iTY6r4= Fix missing .owner field in file_operations. This has been previosly left out because Rust feature `const_refs_to_static` has not been enabled. Now that it is we can make define owner even in const context. This should probably fix use-after-free problems in situations where file is opened and module driver is unloaded during that. Signed-off-by: Kari Argillander --- drivers/gpu/drm/nova/driver.rs | 2 ++ drivers/gpu/drm/tyr/driver.rs | 2 ++ rust/kernel/drm/device.rs | 2 +- rust/kernel/drm/driver.rs | 4 ++++ rust/kernel/drm/gem/mod.rs | 5 +++-- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/nova/driver.rs b/drivers/gpu/drm/nova/driver.rs index b1af0a099551..7ce505802716 100644 --- a/drivers/gpu/drm/nova/driver.rs +++ b/drivers/gpu/drm/nova/driver.rs @@ -14,6 +14,7 @@ use crate::file::File; use crate::gem::NovaObject; +use crate::THIS_MODULE; pub(crate) struct NovaDriver { #[expect(unused)] @@ -65,6 +66,7 @@ fn probe(adev: &auxiliary::Device, _info: &Self::IdInfo) -> impl PinInit; diff --git a/drivers/gpu/drm/tyr/driver.rs b/drivers/gpu/drm/tyr/driver.rs index f0da58932702..11932d3f03ff 100644 --- a/drivers/gpu/drm/tyr/driver.rs +++ b/drivers/gpu/drm/tyr/driver.rs @@ -25,6 +25,7 @@ use crate::gpu; use crate::gpu::GpuInfo; use crate::regs; +use crate::THIS_MODULE; pub(crate) type IoMem = kernel::io::mem::IoMem; @@ -179,6 +180,7 @@ fn drop(self: Pin<&mut Self>) { #[vtable] impl drm::Driver for TyrDriver { + type ThisModule = THIS_MODULE; type Data = TyrData; type File = File; type Object = drm::gem::Object; diff --git a/rust/kernel/drm/device.rs b/rust/kernel/drm/device.rs index 3ce8f62a0056..a740c87933d0 100644 --- a/rust/kernel/drm/device.rs +++ b/rust/kernel/drm/device.rs @@ -92,7 +92,7 @@ impl Device { fops: &Self::GEM_FOPS, }; - const GEM_FOPS: bindings::file_operations = drm::gem::create_fops(); + const GEM_FOPS: bindings::file_operations = drm::gem::create_fops::(); /// Create a new `drm::Device` for a `drm::Driver`. pub fn new(dev: &device::Device, data: impl PinInit) -> Result> { diff --git a/rust/kernel/drm/driver.rs b/rust/kernel/drm/driver.rs index f30ee4c6245c..a157db2ea02b 100644 --- a/rust/kernel/drm/driver.rs +++ b/rust/kernel/drm/driver.rs @@ -9,6 +9,7 @@ error::{to_result, Result}, prelude::*, sync::aref::ARef, + this_module::ThisModule, }; use macros::vtable; @@ -99,6 +100,9 @@ pub trait AllocImpl: super::private::Sealed + drm::gem::IntoGEMObject { /// drm_driver` to be registered in the DRM subsystem. #[vtable] pub trait Driver { + /// Module ownership for this device, provided via `THIS_MODULE`. + type ThisModule: ThisModule; + /// Context data associated with the DRM driver type Data: Sync + Send; diff --git a/rust/kernel/drm/gem/mod.rs b/rust/kernel/drm/gem/mod.rs index d49a9ba02635..705afea65ff6 100644 --- a/rust/kernel/drm/gem/mod.rs +++ b/rust/kernel/drm/gem/mod.rs @@ -11,6 +11,7 @@ error::{to_result, Result}, prelude::*, sync::aref::{ARef, AlwaysRefCounted}, + this_module::ThisModule, types::Opaque, }; use core::{ops::Deref, ptr::NonNull}; @@ -292,10 +293,10 @@ impl AllocImpl for Object { }; } -pub(super) const fn create_fops() -> bindings::file_operations { +pub(super) const fn create_fops() -> bindings::file_operations { let mut fops: bindings::file_operations = pin_init::zeroed(); - fops.owner = core::ptr::null_mut(); + fops.owner = TM::OWNER.as_ptr(); fops.open = Some(bindings::drm_open); fops.release = Some(bindings::drm_release); fops.unlocked_ioctl = Some(bindings::drm_ioctl); -- 2.43.0