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

5.4-stable patches

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

diff --git a/queue-5.4/ocfs2-update-seq_file-index-in-ocfs2_dlm_seq_next.patch b/queue-5.4/ocfs2-update-seq_file-index-in-ocfs2_dlm_seq_next.patch
new file mode 100644
index 00000000000..b376f9db646
--- /dev/null
+++ b/queue-5.4/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
+@@ -3101,6 +3101,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.4/series b/queue-5.4/series
index e272fb7a90d..5ddf72011ba 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -254,6 +254,7 @@ bpf-handle-bpf_exist-and-bpf_noexist-for-lpm-trie.patch
 bpf-fix-exact-match-conditions-in-trie_get_next_key.patch
 hid-wacom-fix-when-get-product-name-maybe-null-pointer.patch
 tracing-fix-cmp_entries_dup-to-respect-sort-comparison-rules.patch
+ocfs2-update-seq_file-index-in-ocfs2_dlm_seq_next.patch
 scsi-qla2xxx-fix-nvme-and-npiv-connect-issue.patch
 scsi-qla2xxx-supported-speed-displayed-incorrectly-for-vports.patch
 scsi-qla2xxx-remove-check-req_sg_cnt-should-be-equal-to-rsp_sg_cnt.patch