Commit ba7bdec3 authored by Azeem Shaikh's avatar Azeem Shaikh Committed by David S. Miller
Browse files

net: Replace strlcpy with strscpy 

strlcpy() reads the entire source buffer first.
This read may exceed the destination size limit.
This is both inefficient and can lead to linear read
overflows if a source string is not NUL-terminated [1].
In an effort to remove strlcpy() completely [2], replace
strlcpy() here with strscpy().
No return values were used, so direct replacement is safe.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy
[2] https://github.com/KSPP/linux/issues/89



Signed-off-by: default avatarAzeem Shaikh <azeemshaikh38@gmail.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 84bef5b6

include/trace/events/fib.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ TRACE_EVENT(fib_table_lookup, 
		}



		dev = nhc ? nhc->nhc_dev : NULL;

		strlcpy(__entry->name, dev ? dev->name : "-", IFNAMSIZ);

		strscpy(__entry->name, dev ? dev->name : "-", IFNAMSIZ);



		if (nhc) {

			if (nhc->nhc_gw_family == AF_INET) {

include/trace/events/fib6.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ TRACE_EVENT(fib6_table_lookup, 
		}



		if (res->nh && res->nh->fib_nh_dev) {

			strlcpy(__entry->name, res->nh->fib_nh_dev->name, IFNAMSIZ);

			strscpy(__entry->name, res->nh->fib_nh_dev->name, IFNAMSIZ);

		} else {

			strcpy(__entry->name, "-");

		}