| Message ID | 20210222151231.22572-4-romain.perier@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Manual replacement of all strlcpy in favor of strscpy | expand |
On Mon, 22 Feb 2021 16:12:14 +0100 Romain Perier wrote: > diff --git a/net/core/devlink.c b/net/core/devlink.c > index 737b61c2976e..7eb445460c92 100644 > --- a/net/core/devlink.c > +++ b/net/core/devlink.c > @@ -9461,10 +9461,10 @@ EXPORT_SYMBOL_GPL(devlink_port_param_value_changed); > void devlink_param_value_str_fill(union devlink_param_value *dst_val, > const char *src) > { > - size_t len; > + ssize_t len; > > - len = strlcpy(dst_val->vstr, src, __DEVLINK_PARAM_MAX_STRING_VALUE); > - WARN_ON(len >= __DEVLINK_PARAM_MAX_STRING_VALUE); > + len = strscpy(dst_val->vstr, src, __DEVLINK_PARAM_MAX_STRING_VALUE); > + WARN_ON(len == -E2BIG); WARN_ON(len < 0) ?
diff --git a/net/core/devlink.c b/net/core/devlink.c index 737b61c2976e..7eb445460c92 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -9461,10 +9461,10 @@ EXPORT_SYMBOL_GPL(devlink_port_param_value_changed); void devlink_param_value_str_fill(union devlink_param_value *dst_val, const char *src) { - size_t len; + ssize_t len; - len = strlcpy(dst_val->vstr, src, __DEVLINK_PARAM_MAX_STRING_VALUE); - WARN_ON(len >= __DEVLINK_PARAM_MAX_STRING_VALUE); + len = strscpy(dst_val->vstr, src, __DEVLINK_PARAM_MAX_STRING_VALUE); + WARN_ON(len == -E2BIG); } EXPORT_SYMBOL_GPL(devlink_param_value_str_fill);
The strlcpy() reads the entire source buffer first, it is dangerous if the source buffer lenght is unbounded or possibility non NULL-terminated. It can lead to linear read overflows, crashes, etc... As recommended in the deprecated interfaces [1], it should be replaced by strscpy. This commit replaces all calls to strlcpy that handle the return values by the corresponding strscpy calls with new handling of the return values (as it is quite different between the two functions). [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#strlcpy Signed-off-by: Romain Perier <romain.perier@gmail.com> --- net/core/devlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)