ftrace: Fix NULL memory allocation check
authorColin Ian King <colin.i.king@gmail.com>
Tue, 22 Apr 2025 22:13:35 +0000 (23:13 +0100)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Thu, 1 May 2025 19:46:19 +0000 (15:46 -0400)
The check for a failed memory location is incorrectly checking
the wrong level of pointer indirection by checking !filter_hash
rather than !*filter_hash.  Fix this.

Cc: asami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/20250422221335.89896-1-colin.i.king@gmail.com
Fixes: 0ae6b8ce200d ("ftrace: Fix accounting of subop hashes")
Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
kernel/trace/ftrace.c

index 61130bb..6981830 100644 (file)
@@ -3436,7 +3436,7 @@ static int add_next_hash(struct ftrace_hash **filter_hash, struct ftrace_hash **
 
                /* Copy the subops hash */
                *filter_hash = alloc_and_copy_ftrace_hash(size_bits, subops_hash->filter_hash);
-               if (!filter_hash)
+               if (!*filter_hash)
                        return -ENOMEM;
                /* Remove any notrace functions from the copy */
                remove_hash(*filter_hash, subops_hash->notrace_hash);