Skip to content

Commit

Permalink
net: Replace strlcpy with strscpy
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Azeem Shaikh authored and David S. Miller committed Jul 4, 2023
1 parent 84bef5b commit ba7bdec
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/trace/events/fib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion include/trace/events/fib6.h
Original file line number Diff line number Diff line change
Expand Up @@ -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, "-");
}
Expand Down

0 comments on commit ba7bdec

Please sign in to comment.