From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 10 Dec 2024 09:48:06 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v6.6.65~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29bfb624f1e1016d2eac20dad8cf74c0fba54cc1;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	ocfs2-update-seq_file-index-in-ocfs2_dlm_seq_next.patch
---

diff --git a/queue-5.15/ocfs2-update-seq_file-index-in-ocfs2_dlm_seq_next.patch b/queue-5.15/ocfs2-update-seq_file-index-in-ocfs2_dlm_seq_next.patch
new file mode 100644
index 00000000000..184b5775edc
--- /dev/null
+++ b/queue-5.15/ocfs2-update-seq_file-index-in-ocfs2_dlm_seq_next.patch
@@ -0,0 +1,43 @@
+From 914eec5e980171bc128e7e24f7a22aa1d803570e Mon Sep 17 00:00:00 2001
+From: Wengang Wang <wen.gang.wang@oracle.com>
+Date: Tue, 19 Nov 2024 09:45:00 -0800
+Subject: ocfs2: update seq_file index in ocfs2_dlm_seq_next
+
+From: Wengang Wang <wen.gang.wang@oracle.com>
+
+commit 914eec5e980171bc128e7e24f7a22aa1d803570e upstream.
+
+The following INFO level message was seen:
+
+seq_file: buggy .next function ocfs2_dlm_seq_next [ocfs2] did not
+update position index
+
+Fix:
+Update *pos (so m->index) to make seq_read_iter happy though the index its
+self makes no sense to ocfs2_dlm_seq_next.
+
+Link: https://lkml.kernel.org/r/20241119174500.9198-1-wen.gang.wang@oracle.com
+Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
+Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
+Cc: Mark Fasheh <mark@fasheh.com>
+Cc: Joel Becker <jlbec@evilplan.org>
+Cc: Junxiao Bi <junxiao.bi@oracle.com>
+Cc: Changwei Ge <gechangwei@live.cn>
+Cc: Jun Piao <piaojun@huawei.com>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/ocfs2/dlmglue.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/fs/ocfs2/dlmglue.c
++++ b/fs/ocfs2/dlmglue.c
+@@ -3108,6 +3108,7 @@ static void *ocfs2_dlm_seq_next(struct s
+ 	struct ocfs2_lock_res *iter = v;
+ 	struct ocfs2_lock_res *dummy = &priv->p_iter_res;
+ 
++	(*pos)++;
+ 	spin_lock(&ocfs2_dlm_tracking_lock);
+ 	iter = ocfs2_dlm_next_res(iter, priv);
+ 	list_del_init(&dummy->l_debug_list);
diff --git a/queue-5.15/series b/queue-5.15/series
index 052967e3293..956c6f4753a 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -467,3 +467,4 @@ xsk-fix-oob-map-writes-when-deleting-elements.patch
 regmap-detach-regmap-from-dev-on-regmap_exit.patch
 mmc-sdhci-pci-add-dmi-quirk-for-missing-cd-gpio-on-vexia-edu-atla-10-tablet.patch
 mmc-core-further-prevent-card-detect-during-shutdown.patch
+ocfs2-update-seq_file-index-in-ocfs2_dlm_seq_next.patch