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: Azeem Shaikh <azeemshaikh38@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/trace/events/fib.h b/include/trace/events/fib.h
index 76297ecd4935c97ffe97a620c8f398e7d835be50..20b914250ce926371843f4c506f7027960b1787c 100644 (file)
--- a/include/trace/events/fib.h
+++ b/include/trace/events/fib.h
@@ -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) {

diff --git a/include/trace/events/fib6.h b/include/trace/events/fib6.h
index 4d3e607b3cdecc3583d4f06c59eca71e9fca365a..5d7ee2610728060a0deeb33c0167963e19d1ff5c 100644 (file)
--- a/include/trace/events/fib6.h
+++ b/include/trace/events/fib6.h
@@ -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, "-");
                }