Commit 3c1d9cfa authored by Colin Ian King's avatar Colin Ian King Committed by Steven Rostedt (Google)
Browse files

ftrace: Fix NULL memory allocation check 

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: 0ae6b8ce ("ftrace: Fix accounting of subop hashes")
Signed-off-by: default avatarColin Ian King <colin.i.king@gmail.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent f5178c41

kernel/trace/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -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);