netdev - [PATCH] tracing/ipv4/ipv6: Give size to name field in fib*_lookup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220703102359.30f12e39@rorschach.local.home>
Date:   Sun, 3 Jul 2022 10:23:59 -0400
From:   Steven Rostedt <rostedt@...dmis.org>
To:     LKML <linux-kernel@...r.kernel.org>
Cc:     David Ahern <dsahern@...il.com>,
        "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org
Subject: [PATCH] tracing/ipv4/ipv6: Give size to name field in
 fib*_lookup_table event

From: "Steven Rostedt (Google)" <rostedt@...dmis.org>

The fib_lookup_table and fib6_lookup_table events declare name as a
dynamic_array, but also give it a fixed size, which defeats the purpose of
the dynamic array, especially since the dynamic array also includes meta
data in the event to specify its size.

Considering that the intent was to only reserve the size needed for the
name and not a fixed size, convert the size part of the __dynamic_array()
field to contain the necessary code to determine the size needed to save
the name.

Alternatively, if the intent was to use a fixed size, then it should be
converted into __array() of type char, which will remove the meta data in
the event that stores the size.

Cc: David Ahern <dsahern@...il.com>
Cc: David S. Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org
Signed-off-by: Steven Rostedt (Google) <rostedt@...dmis.org>
---
 include/trace/events/fib.h  | 2 +-
 include/trace/events/fib6.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/trace/events/fib.h b/include/trace/events/fib.h
index 6f2a4dc35e37..76f925f5519a 100644
--- a/include/trace/events/fib.h
+++ b/include/trace/events/fib.h
@@ -32,7 +32,7 @@ TRACE_EVENT(fib_table_lookup,
 		__array(	__u8,	gw6,	16	)
 		__field(	u16,	sport		)
 		__field(	u16,	dport		)
-		__dynamic_array(char,  name,   IFNAMSIZ )
+		__dynamic_array(char,  name,   nhc && nhc->nhc_dev ? strlen(nhc->nhc_dev->name) + 1 : sizeof("-") )
 	),
 
 	TP_fast_assign(
diff --git a/include/trace/events/fib6.h b/include/trace/events/fib6.h
index c6abdcc77c12..d3aee58e58fd 100644
--- a/include/trace/events/fib6.h
+++ b/include/trace/events/fib6.h
@@ -31,7 +31,8 @@ TRACE_EVENT(fib6_table_lookup,
 		__field(        u16,	dport		)
 		__field(        u8,	proto		)
 		__field(        u8,	rt_type		)
-		__dynamic_array(	char,	name,	IFNAMSIZ )
+		__dynamic_array(	char,	name,	res->nh && res->nh->fib_nh_dev ?
+							strlen(res->nh->fib_nh_dev->name) + 1 : sizeof("-") )
 		__array(		__u8,	gw,	16	 )
 	),
 
-- 
2.35.1