6.19-stable patches

added patches:
	rust_binder-fix-build-failure-if-config_compat.patch
	series

diff --git a/queue-6.19/rust_binder-fix-build-failure-if-config_compat.patch b/queue-6.19/rust_binder-fix-build-failure-if-config_compat.patch
new file mode 100644 (file)
index 0000000..48b76fb
--- /dev/null
+++ b/queue-6.19/rust_binder-fix-build-failure-if-config_compat.patch
@@ -0,0 +1,36 @@
+From 174e2a339bf731e080ced67c215ad609a677560b Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@xry111.site>
+Date: Tue, 9 Dec 2025 20:50:19 +0800
+Subject: rust_binder: Fix build failure if !CONFIG_COMPAT
+
+From: Xi Ruoyao <xry111@xry111.site>
+
+commit 174e2a339bf731e080ced67c215ad609a677560b upstream.
+
+The bindgen utility cannot handle "#define compat_ptr_ioctl NULL" in the
+C header, so we need to handle this case on our own.
+
+Simply skip this field in the initializer when !CONFIG_COMPAT as the
+SAFETY comment above this initializer implies this is allowed.
+
+Reported-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
+Closes: https://lore.kernel.org/all/CANiq72mrVzqXnAV=Hy2XBOonLHA6YQgH-ckZoc_h0VBvTGK8rA@mail.gmail.com/
+Signed-off-by: Xi Ruoyao <xry111@xry111.site>
+Reviewed-by: Alice Ryhl <aliceryhl@google.com>
+Link: https://patch.msgid.link/20251209125029.1117897-1-xry111@xry111.site
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/android/binder/rust_binder_main.rs |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/android/binder/rust_binder_main.rs
++++ b/drivers/android/binder/rust_binder_main.rs
+@@ -314,6 +314,7 @@ pub static rust_binder_fops: AssertSync<
+         owner: THIS_MODULE.as_ptr(),
+         poll: Some(rust_binder_poll),
+         unlocked_ioctl: Some(rust_binder_ioctl),
++        #[cfg(CONFIG_COMPAT)]
+         compat_ioctl: Some(bindings::compat_ptr_ioctl),
+         mmap: Some(rust_binder_mmap),
+         open: Some(rust_binder_open),

diff --git a/queue-6.19/series b/queue-6.19/series
new file mode 100644 (file)
index 0000000..7a461b5
--- /dev/null
+++ b/queue-6.19/series
@@ -0,0 +1 @@
+rust_binder-fix-build-failure-if-config_compat.patch