Skip to content

Commit

Permalink
rv: Fix out-of-bound memory access in rv_is_container_monitor()
Browse files Browse the repository at this point in the history
When rv_is_container_monitor() is called on the last monitor in
rv_monitors_list, KASAN yells:

  BUG: KASAN: global-out-of-bounds in rv_is_container_monitor+0x101/0x110
  Read of size 8 at addr ffffffff97c7c798 by task setup/221

  The buggy address belongs to the variable:
   rv_monitors_list+0x18/0x40

This is due to list_next_entry() is called on the last entry in the list.
It wraps around to the first list_head, and the first list_head is not
embedded in struct rv_monitor_def.

Fix it by checking if the monitor is last in the list.

Cc: stable@vger.kernel.org
Cc: Gabriele Monaco <gmonaco@redhat.com>
Fixes: cb85c66 ("rv: Add option for nested monitors and include sched")
Link: https://lore.kernel.org/e85b5eeb7228bfc23b8d7d4ab5411472c54ae91b.1744355018.git.namcao@linutronix.de
Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
  • Loading branch information
Nam Cao authored and Steven Rostedt (Google) committed Apr 12, 2025
1 parent 485acd2 commit 8d7861a
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion kernel/trace/rv/rv.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,12 @@ bool rv_is_nested_monitor(struct rv_monitor_def *mdef)
*/
bool rv_is_container_monitor(struct rv_monitor_def *mdef)
{
struct rv_monitor_def *next = list_next_entry(mdef, list);
struct rv_monitor_def *next;

if (list_is_last(&mdef->list, &rv_monitors_list))
return false;

next = list_next_entry(mdef, list);

return next->parent == mdef->monitor || !mdef->monitor->enable;
}
Expand Down

0 comments on commit 8d7861a

Please sign in to comment.