Commit 9cbf1234 authored by Beau Belgrave's avatar Beau Belgrave Committed by Steven Rostedt (Google)
Browse files

tracing/user_events: Use NULL for strstr checks 

Trivial fix to ensure strstr checks use NULL instead of 0.

Link: https://lkml.kernel.org/r/20220728233309.1896-2-beaub@linux.microsoft.com



Signed-off-by: default avatarBeau Belgrave <beaub@linux.microsoft.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent e841e8bf

kernel/trace/trace_events_user.c

+3 −3
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int user_event_add_field(struct user_event *user, const char *type, 
	goto add_field;



add_validator:

	if (strstr(type, "char") != 0)

	if (strstr(type, "char") != NULL)

		validator_flags |= VALIDATOR_ENSURE_NULL;



	validator = kmalloc(sizeof(*validator), GFP_KERNEL);
@@ -458,7 +458,7 @@ static const char *user_field_format(const char *type) 
		return "%d";

	if (strcmp(type, "unsigned char") == 0)

		return "%u";

	if (strstr(type, "char[") != 0)

	if (strstr(type, "char[") != NULL)

		return "%s";



	/* Unknown, likely struct, allowed treat as 64-bit */
@@ -479,7 +479,7 @@ static bool user_field_is_dyn_string(const char *type, const char **str_func) 


	return false;

check:

	return strstr(type, "char") != 0;

	return strstr(type, "char") != NULL;

}



#define LEN_OR_ZERO (len ? len - pos : 0)