aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXu Panda <[email protected]>2022-11-22 08:53:25 +0800
committerAndrew Morton <[email protected]>2022-12-11 19:30:18 -0800
commit3f0dad0105133ffcfa13eb0cd980fa347bcf31d7 (patch)
treec6eb0285e0f38713f240d148b5d905077bf76fbd
parentfe5759d5bfda312dd52fc81405ffc1d024b18039 (diff)
relay: use strscpy() is more robust and safer
The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL terminated strings. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Xu Panda <[email protected]> Signed-off-by: Yang Yang <[email protected]> Cc: Colin Ian King <[email protected]> Cc: Jens Axboe <[email protected]> Cc: wuchi <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
-rw-r--r--kernel/relay.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/relay.c b/kernel/relay.c
index d7edc934c56d..0a3d2e702001 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -507,7 +507,7 @@ struct rchan *relay_open(const char *base_filename,
chan->private_data = private_data;
if (base_filename) {
chan->has_base_filename = 1;
- strlcpy(chan->base_filename, base_filename, NAME_MAX);
+ strscpy(chan->base_filename, base_filename, NAME_MAX);
}
chan->cb = cb;
kref_init(&chan->kref);
@@ -578,7 +578,7 @@ int relay_late_setup_files(struct rchan *chan,
if (!chan || !base_filename)
return -EINVAL;
- strlcpy(chan->base_filename, base_filename, NAME_MAX);
+ strscpy(chan->base_filename, base_filename, NAME_MAX);
mutex_lock(&relay_channels_mutex);
/* Is chan already set up? */