]> git.baikalelectronics.ru Git - kernel.git/commitdiff
neighbor: tracing: Have neigh_create event use __string()
authorSteven Rostedt (Google) <rostedt@goodmis.org>
Tue, 5 Jul 2022 22:37:41 +0000 (18:37 -0400)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Fri, 15 Jul 2022 17:35:59 +0000 (13:35 -0400)
The dev field of the neigh_create event uses __dynamic_array() with a
fixed size, which defeats the purpose of __dynamic_array(). Looking at the
logic, as it already uses __assign_str(), just use the same logic in
__string to create the size needed. It appears that because "dev" can be
NULL, it needs the check. But __string() can have the same checks as
__assign_str() so use them there too.

Link: https://lkml.kernel.org/r/20220705183741.35387e3f@rorschach.local.home
Cc: David Ahern <dsahern@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Acked-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
include/trace/events/neigh.h

index 62bb17516713f52e44af754c583467c52ac35dc4..5eaa1fa9917153f6038d82ce5474d1f9acc6a0fa 100644 (file)
@@ -30,7 +30,7 @@ TRACE_EVENT(neigh_create,
 
        TP_STRUCT__entry(
                __field(u32, family)
-               __dynamic_array(char,  dev,   IFNAMSIZ )
+               __string(dev, dev ? dev->name : "NULL")
                __field(int, entries)
                __field(u8, created)
                __field(u8, gc_exempt)