Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 05:45:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

relay: use strscpy() is more robust and safer

Browse Source 
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/202211220853259244666@zte.com.cn
Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
Signed-off-by: Yang Yang <yang.yang29@zte.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: wuchi <wuchi.zero@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Xu Panda 2022-11-22 08:53:25 +08:00 committed by Andrew Morton
parent fe5759d5bf
commit 3f0dad0105
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/relay.c
View File

@ -507,7 +507,7 @@ struct rchan *relay_open(const char *base_filename,
chan->private_data = private_data; chan->private_data = private_data;
if (base_filename) { if (base_filename) {
chan->has_base_filename = 1; chan->has_base_filename = 1;
strlcpy(chan->base_filename, base_filename, NAME_MAX); strscpy(chan->base_filename, base_filename, NAME_MAX);
} }
chan->cb = cb; chan->cb = cb;
kref_init(&chan->kref); kref_init(&chan->kref);
@ -578,7 +578,7 @@ int relay_late_setup_files(struct rchan *chan,
if (!chan || !base_filename) if (!chan || !base_filename)
return -EINVAL; return -EINVAL;
strlcpy(chan->base_filename, base_filename, NAME_MAX); strscpy(chan->base_filename, base_filename, NAME_MAX);
mutex_lock(&relay_channels_mutex); mutex_lock(&relay_channels_mutex);
/* Is chan already set up? */ /* Is chan already set up? */