]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rv: Fully convert enabled_monitors to use list_head as iterator
authorNam Cao <namcao@linutronix.de>
Thu, 2 Oct 2025 08:22:35 +0000 (08:22 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Oct 2025 13:10:23 +0000 (14:10 +0100)
commit 103541e6a5854b08a25e4caa61e990af1009a52e upstream.

The callbacks in enabled_monitors_seq_ops are inconsistent. Some treat the
iterator as struct rv_monitor *, while others treat the iterator as struct
list_head *.

This causes a wrong type cast and crashes the system as reported by Nathan.

Convert everything to use struct list_head * as iterator. This also makes
enabled_monitors consistent with available_monitors.

Fixes: de090d1ccae1 ("rv: Fix wrong type cast in enabled_monitors_next()")
Reported-by: Nathan Chancellor <nathan@kernel.org>
Closes: https://lore.kernel.org/linux-trace-kernel/20250923002004.GA2836051@ax162/
Signed-off-by: Nam Cao <namcao@linutronix.de>
Cc: stable@vger.kernel.org
Reviewed-by: Gabriele Monaco <gmonaco@redhat.com>
Link: https://lore.kernel.org/r/20251002082235.973099-1-namcao@linutronix.de
Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/trace/rv/rv.c

index 48338520376f90d5a85b6fbef7ee107ab2852732..43e9ea473cda4c23d72c59100de80bc519188f31 100644 (file)
@@ -501,7 +501,7 @@ static void *enabled_monitors_next(struct seq_file *m, void *p, loff_t *pos)
 
        list_for_each_entry_continue(mon, &rv_monitors_list, list) {
                if (mon->enabled)
-                       return mon;
+                       return &mon->list;
        }
 
        return NULL;
@@ -509,7 +509,7 @@ static void *enabled_monitors_next(struct seq_file *m, void *p, loff_t *pos)
 
 static void *enabled_monitors_start(struct seq_file *m, loff_t *pos)
 {
-       struct rv_monitor *mon;
+       struct list_head *head;
        loff_t l;
 
        mutex_lock(&rv_interface_lock);
@@ -517,15 +517,15 @@ static void *enabled_monitors_start(struct seq_file *m, loff_t *pos)
        if (list_empty(&rv_monitors_list))
                return NULL;
 
-       mon = list_entry(&rv_monitors_list, struct rv_monitor, list);
+       head = &rv_monitors_list;
 
        for (l = 0; l <= *pos; ) {
-               mon = enabled_monitors_next(m, mon, &l);
-               if (!mon)
+               head = enabled_monitors_next(m, head, &l);
+               if (!head)
                        break;
        }
 
-       return mon;
+       return head;
 }
 
 /*