renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 06:04:14 +08:00
Code

staging: most: Switch from strlcpy to strscpy

Browse Source 
strlcpy is marked as deprecated in Documentation/process/deprecated.rst,
and there is no functional difference when the caller expects truncation
(when not checking the return value). strscpy is relatively better as it
also avoids scanning the whole source string.

This silences the related checkpatch warnings from:
5dbdb2d87c ("checkpatch: prefer strscpy to strlcpy")

Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20210131172838.146706-5-memxor@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kumar Kartikeya Dwivedi 2021-01-31 22:58:25 +05:30 committed by Greg Kroah-Hartman
parent a288a21e70
commit 6367dee9e3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/most/sound/sound.c
View File

@ -527,7 +527,7 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,
pr_err("Incompatible channel type\n"); pr_err("Incompatible channel type\n");
return -EINVAL; return -EINVAL;
} }
strlcpy(arg_list_cpy, arg_list, STRING_SIZE); strscpy(arg_list_cpy, arg_list, STRING_SIZE);
ret = split_arg_list(arg_list_cpy, &ch_num, &sample_res); ret = split_arg_list(arg_list_cpy, &ch_num, &sample_res);
if (ret < 0) if (ret < 0)
return ret; return ret;

6
drivers/staging/most/video/video.c
View File

@ -245,8 +245,8 @@ static int vidioc_querycap(struct file *file, void *priv,
struct comp_fh *fh = priv; struct comp_fh *fh = priv;
struct most_video_dev *mdev = fh->mdev; struct most_video_dev *mdev = fh->mdev;
strlcpy(cap->driver, "v4l2_component", sizeof(cap->driver)); strscpy(cap->driver, "v4l2_component", sizeof(cap->driver));
strlcpy(cap->card, "MOST", sizeof(cap->card)); strscpy(cap->card, "MOST", sizeof(cap->card));
snprintf(cap->bus_info, sizeof(cap->bus_info), snprintf(cap->bus_info, sizeof(cap->bus_info),
"%s", mdev->iface->description); "%s", mdev->iface->description);
return 0; return 0;
@ -483,7 +483,7 @@ static int comp_probe_channel(struct most_interface *iface, int channel_idx,
mdev->v4l2_dev.release = comp_v4l2_dev_release; mdev->v4l2_dev.release = comp_v4l2_dev_release;
/* Create the v4l2_device */ /* Create the v4l2_device */
strlcpy(mdev->v4l2_dev.name, name, sizeof(mdev->v4l2_dev.name)); strscpy(mdev->v4l2_dev.name, name, sizeof(mdev->v4l2_dev.name));
ret = v4l2_device_register(NULL, &mdev->v4l2_dev); ret = v4l2_device_register(NULL, &mdev->v4l2_dev);
if (ret) { if (ret) {
pr_err("v4l2_device_register() failed\n"); pr_err("v4l2_device_register() failed\n");