6.9-stable patches

added patches:
	afs-don-t-cross-.backup-mountpoint-from-backup-volume.patch

diff --git a/queue-6.9/afs-don-t-cross-.backup-mountpoint-from-backup-volume.patch b/queue-6.9/afs-don-t-cross-.backup-mountpoint-from-backup-volume.patch
new file mode 100644 (file)
index 0000000..4a07b1e
--- /dev/null
+++ b/queue-6.9/afs-don-t-cross-.backup-mountpoint-from-backup-volume.patch
@@ -0,0 +1,50 @@
+From 29be9100aca2915fab54b5693309bc42956542e5 Mon Sep 17 00:00:00 2001
+From: Marc Dionne <marc.dionne@auristor.com>
+Date: Fri, 24 May 2024 17:17:55 +0100
+Subject: afs: Don't cross .backup mountpoint from backup volume
+
+From: Marc Dionne <marc.dionne@auristor.com>
+
+commit 29be9100aca2915fab54b5693309bc42956542e5 upstream.
+
+Don't cross a mountpoint that explicitly specifies a backup volume
+(target is <vol>.backup) when starting from a backup volume.
+
+It it not uncommon to mount a volume's backup directly in the volume
+itself.  This can cause tools that are not paying attention to get
+into a loop mounting the volume onto itself as they attempt to
+traverse the tree, leading to a variety of problems.
+
+This doesn't prevent the general case of loops in a sequence of
+mountpoints, but addresses a common special case in the same way
+as other afs clients.
+
+Reported-by: Jan Henrik Sylvester <jan.henrik.sylvester@uni-hamburg.de>
+Link: http://lists.infradead.org/pipermail/linux-afs/2024-May/008454.html
+Reported-by: Markus Suvanto <markus.suvanto@gmail.com>
+Link: http://lists.infradead.org/pipermail/linux-afs/2024-February/008074.html
+Signed-off-by: Marc Dionne <marc.dionne@auristor.com>
+Signed-off-by: David Howells <dhowells@redhat.com>
+Link: https://lore.kernel.org/r/768760.1716567475@warthog.procyon.org.uk
+Reviewed-by: Jeffrey Altman <jaltman@auristor.com>
+cc: linux-afs@lists.infradead.org
+Signed-off-by: Christian Brauner <brauner@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/afs/mntpt.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/fs/afs/mntpt.c
++++ b/fs/afs/mntpt.c
+@@ -140,6 +140,11 @@ static int afs_mntpt_set_params(struct f
+               put_page(page);
+               if (ret < 0)
+                       return ret;
++
++              /* Don't cross a backup volume mountpoint from a backup volume */
++              if (src_as->volume && src_as->volume->type == AFSVL_BACKVOL &&
++                  ctx->type == AFSVL_BACKVOL)
++                      return -ENODEV;
+       }
+ 
+       return 0;

diff --git a/queue-6.9/series b/queue-6.9/series
index 7d8dfc3b2d8ea6cf5dd49b22722b8d9c7b56d73b..6decdb0db79f2cf90e7be5b17efb05122d84a5b5 100644 (file)
--- a/queue-6.9/series
+++ b/queue-6.9/series
@@ -1,3 +1,4 @@
 e1000e-move-force-smbus-near-the-end-of-enable_ulp-function.patch
 drm-amdkfd-handle-duplicate-bos-in-reserve_bo_and_cond_vms.patch
 drm-i915-hwmon-get-rid-of-devm.patch
+afs-don-t-cross-.backup-mountpoint-from-backup-volume.patch