[PATCH 04/13] staging: most: Switch from strlcpy to strscpy

From: Kumar Kartikeya Dwivedi <memxor@gmail.com>
To: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org,
	linux-kernel@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org,
	Jon Nettleton <jon.nettleton@gmail.com>,
	Mark Greer <mgreer@animalcreek.com>,
	Al Viro <viro@zeniv.linux.org.uk>,
	Marc Dietrich <marvin24@gmx.de>,
	Ioana Ciornei <ioana.ciornei@nxp.com>,
	ac100@lists.launchpad.net,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Daniel Drake <dsd@laptop.org>,
	Jens Frederich <jfrederich@gmail.com>,
	Viresh Kumar <vireshk@kernel.org>,
	Robert Richter <rric@kernel.org>,
	Vaibhav Agarwal <vaibhav.sr@gmail.com>,
	Johan Hovold <johan@kernel.org>, Ian Abbott <abbotti@mev.co.uk>,
	Kumar Kartikeya Dwivedi <memxor@gmail.com>,
	linux-tegra@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
	Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
	Alex Elder <elder@kernel.org>,
	Teddy Wang <teddy.wang@siliconmotion.com>,
	greybus-dev@lists.linaro.org,
	Andrew Morton <akpm@linux-foundation.org>,
	Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
	Mike Rapoport <rppt@kernel.org>,
	Larry Finger <Larry.Finger@lwfinger.net>
Subject: [PATCH 04/13] staging: most: Switch from strlcpy to strscpy
Date: Sun, 31 Jan 2021 22:58:25 +0530	[thread overview]
Message-ID: <20210131172838.146706-5-memxor@gmail.com> (raw)
In-Reply-To: <20210131172838.146706-1-memxor@gmail.com>

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:
5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy")

Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
---
 drivers/staging/most/sound/sound.c | 2 +-
 drivers/staging/most/video/video.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/most/sound/sound.c b/drivers/staging/most/sound/sound.c
index 3a1a59058..c4287994b 100644
--- a/drivers/staging/most/sound/sound.c
+++ b/drivers/staging/most/sound/sound.c
@@ -525,7 +525,7 @@ static int audio_probe_channel(struct most_interface *iface, int channel_id,
 		pr_err("Incompatible channel type\n");
 		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);
 	if (ret < 0)
 		return ret;
diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c
index 829df899b..90933d78c 100644
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@ -245,8 +245,8 @@ static int vidioc_querycap(struct file *file, void *priv,
 	struct comp_fh *fh = priv;
 	struct most_video_dev *mdev = fh->mdev;
 
-	strlcpy(cap->driver, "v4l2_component", sizeof(cap->driver));
-	strlcpy(cap->card, "MOST", sizeof(cap->card));
+	strscpy(cap->driver, "v4l2_component", sizeof(cap->driver));
+	strscpy(cap->card, "MOST", sizeof(cap->card));
 	snprintf(cap->bus_info, sizeof(cap->bus_info),
 		 "%s", mdev->iface->description);
 	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;
 
 	/* 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);
 	if (ret) {
 		pr_err("v4l2_device_register() failed\n");
-- 
2.29.2

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
