drop ceph patch from 6.6

diff --git a/queue-6.6/ceph-add-owner-capability-checks-for-ceph_ioc_set_layout.patch b/queue-6.6/ceph-add-owner-capability-checks-for-ceph_ioc_set_layout.patch
deleted file mode 100644 (file)
index d549501..0000000
--- a/queue-6.6/ceph-add-owner-capability-checks-for-ceph_ioc_set_layout.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From cee38bbf5556a8e0a232ccae41649580827d7806 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max.kellermann@ionos.com>
-Date: Tue, 21 Jul 2026 08:20:46 +0200
-Subject: ceph: add owner/capability checks for CEPH_IOC_SET_LAYOUT*
-
-From: Max Kellermann <max.kellermann@ionos.com>
-
-commit cee38bbf5556a8e0a232ccae41649580827d7806 upstream.
-
-These permission checks were already missing in the initial
-impementation of these ioctls.  This Ceph allows any user who owns a
-file descriptor to manipulate the layout of any file, even if they
-don't have write permissions.
-
-It might be a good idea to guard other ioctls with permission checks
-as well or even disallow regular users (even if they own the file) to
-manipulate layout settings completely, as this may be abused to DoS
-the Ceph servers, but right now, I find it most urgent to have setter
-checks at all.
-
-Cc: stable@vger.kernel.org
-Fixes: 8f4e91dee2a2 ("ceph: ioctls")
-Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
-Reviewed-by: Xiubo Li <xiubo.li@clyso.com>
-Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ceph/ioctl.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/fs/ceph/ioctl.c
-+++ b/fs/ceph/ioctl.c
-@@ -72,6 +72,9 @@ static long ceph_ioctl_set_layout(struct
-       struct ceph_ioctl_layout nl;
-       int err;
- 
-+      if (!inode_owner_or_capable(&nop_mnt_idmap, inode))
-+              return -EACCES;
-+
-       if (copy_from_user(&l, arg, sizeof(l)))
-               return -EFAULT;
- 
-@@ -142,6 +145,9 @@ static long ceph_ioctl_set_layout_policy
-       int err;
-       struct ceph_mds_client *mdsc = ceph_sb_to_fs_client(inode->i_sb)->mdsc;
- 
-+      if (!inode_owner_or_capable(&nop_mnt_idmap, inode))
-+              return -EACCES;
-+
-       /* copy and validate */
-       if (copy_from_user(&l, arg, sizeof(l)))
-               return -EFAULT;

diff --git a/queue-6.6/series b/queue-6.6/series
index 01ac1ccbad01f59a825acc411bdcf6e3a21f654e..8ce6a84db09aa8d5d2f3b11c69275c6397e820d7 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -299,7 +299,6 @@ revert-arm64-syscall-ensure-saved-x0-is-kept-in-sync-with-tracer-updates.patch
 mptcp-decrement-subflows-counter-on-failed-passive-join.patch
 mptcp-only-set-data_fin-when-a-mapping-is-present.patch
 sctp-don-t-free-the-asconf-s-own-transport-in-del-ip-processing.patch
-ceph-add-owner-capability-checks-for-ceph_ioc_set_layout.patch
 ceph-fix-pre-auth-out-of-bounds-read-on-snaptrace-in-ceph_handle_caps.patch
 libceph-bound-get_version-reply-decode-to-front-len.patch
 libceph-fix-multiplication-overflow-in-decode_new_up_state_weight.patch