From: Alex Elder <elder@ieee.org>
To: Kumar Kartikeya Dwivedi <memxor@gmail.com>,
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>,
Marc Dietrich <marvin24@gmx.de>,
Ioana Ciornei <ioana.ciornei@nxp.com>,
Thomas Gleixner <tglx@linutronix.de>,
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>,
Al Viro <viro@zeniv.linux.org.uk>,
linux-tegra@vger.kernel.org, William Cohen <wcohen@redhat.com>,
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: Re: [PATCH 02/13] staging: greybus: Switch from strlcpy to strscpy
Date: Tue, 16 Feb 2021 08:54:59 -0600 [thread overview]
Message-ID: <b565bdae-10a9-9b6c-ae60-dcee88f7dedd@ieee.org> (raw)
In-Reply-To: <20210131172838.146706-3-memxor@gmail.com>
On 1/31/21 11:28 AM, Kumar Kartikeya Dwivedi wrote:
> 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>
This is a good change. But while you're at it, I would
appreciate if you would convert a few spots to use
sizeof(dest) rather than a fixed constant. I will
point them out below.
If this is the *only* request for a change on your
series, please tell me that and I can sign off on
this without you implementing my suggestion. But
if you post a version 2, please do what I describe.
Thanks.
-Alex
> ---
> drivers/staging/greybus/audio_helper.c | 2 +-
> drivers/staging/greybus/audio_module.c | 2 +-
> drivers/staging/greybus/audio_topology.c | 6 +++---
> drivers/staging/greybus/power_supply.c | 2 +-
> drivers/staging/greybus/spilib.c | 4 ++--
> 5 files changed, 8 insertions(+), 8 deletions(-)
. . .
> diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c
> index a243d60f0..0f9fdc077 100644
> --- a/drivers/staging/greybus/audio_module.c
> +++ b/drivers/staging/greybus/audio_module.c
> @@ -342,7 +342,7 @@ static int gb_audio_probe(struct gb_bundle *bundle,
> /* inform above layer for uevent */
> dev_dbg(dev, "Inform set_event:%d to above layer\n", 1);
> /* prepare for the audio manager */
> - strlcpy(desc.name, gbmodule->name, GB_AUDIO_MANAGER_MODULE_NAME_LEN);
> + strscpy(desc.name, gbmodule->name, GB_AUDIO_MANAGER_MODULE_NAME_LEN);
Please use this here instead:
strscpy(desc.name, gbmodule->name, sizeof(desc.name));
> desc.vid = 2; /* todo */
> desc.pid = 3; /* todo */
> desc.intf_id = gbmodule->dev_id;
> diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
> index 662e3e8b4..e816e4db5 100644
> --- a/drivers/staging/greybus/audio_topology.c
> +++ b/drivers/staging/greybus/audio_topology.c
> @@ -200,7 +200,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,
> return -EINVAL;
> name = gbaudio_map_controlid(module, data->ctl_id,
> uinfo->value.enumerated.item);
> - strlcpy(uinfo->value.enumerated.name, name, NAME_SIZE);
> + strscpy(uinfo->value.enumerated.name, name, NAME_SIZE);
Please use this here instead:
strscpy(uinfo->value.enumerated.name, name,
sizeof(uinfo->valiue.enumerated.name));
(I know NAME_SIZE is used throughout this file, and
could also be converted in this way, but we can save
that for another patch.)
> break;
> default:
> dev_err(comp->dev, "Invalid type: %d for %s:kcontrol\n",
> @@ -1047,7 +1047,7 @@ static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module,
> }
>
> /* Prefix dev_id to widget control_name */
> - strlcpy(temp_name, w->name, NAME_SIZE);
> + strscpy(temp_name, w->name, NAME_SIZE);
Please use this here instead:
strscpy(temp_name, w->name, sizeof(temp_name));
> snprintf(w->name, NAME_SIZE, "GB %d %s", module->dev_id, temp_name);
>
> switch (w->type) {
> @@ -1169,7 +1169,7 @@ static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module,
> }
> control->id = curr->id;
> /* Prefix dev_id to widget_name */
> - strlcpy(temp_name, curr->name, NAME_SIZE);
> + strscpy(temp_name, curr->name, NAME_SIZE);
Please use this here instead:
strscpy(temp_name, curr->name, sizeof(temp_name));
> snprintf(curr->name, NAME_SIZE, "GB %d %s", module->dev_id,
> temp_name);
> control->name = curr->name;
. . .
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2021-02-16 14:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-31 17:28 [PATCH 00/13] Convert all users of strlcpy to strscpy Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 01/13] staging: comedi: Switch from " Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 02/13] staging: greybus: " Kumar Kartikeya Dwivedi
2021-02-16 14:54 ` Alex Elder [this message]
2021-02-16 15:48 ` Kumar Kartikeya Dwivedi
2021-02-16 15:49 ` Alex Elder
2021-02-21 15:42 ` [PATCH] staging/greybus: eliminate use of NAME_SIZE for strings Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 03/13] staging: fsl-dpaa2: Switch from strlcpy to strscpy Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 04/13] staging: most: " Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 05/13] staging: nvec: " Kumar Kartikeya Dwivedi
2021-02-03 11:09 ` Marc Dietrich
2021-01-31 17:28 ` [PATCH 06/13] staging: octeon: " Kumar Kartikeya Dwivedi
2021-02-16 14:36 ` Robert Richter
2021-01-31 17:28 ` [PATCH 07/13] staging: olpc_dcon: " Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 08/13] staging: rtl8188eu: " Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 09/13] staging: rtl8192e: " Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 10/13] staging: rtl8192u: " Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 11/13] staging: rtl8712: " Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 12/13] staging: sm750fb: " Kumar Kartikeya Dwivedi
2021-01-31 17:28 ` [PATCH 13/13] staging: wimax: " Kumar Kartikeya Dwivedi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b565bdae-10a9-9b6c-ae60-dcee88f7dedd@ieee.org \
--to=elder@ieee.org \
--cc=Larry.Finger@lwfinger.net \
--cc=abbotti@mev.co.uk \
--cc=ac100@lists.launchpad.net \
--cc=akpm@linux-foundation.org \
--cc=devel@driverdev.osuosl.org \
--cc=dsd@laptop.org \
--cc=elder@kernel.org \
--cc=f.fainelli@gmail.com \
--cc=florian.c.schilhabel@googlemail.com \
--cc=gregkh@linuxfoundation.org \
--cc=greybus-dev@lists.linaro.org \
--cc=ioana.ciornei@nxp.com \
--cc=jfrederich@gmail.com \
--cc=johan@kernel.org \
--cc=jon.nettleton@gmail.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=marvin24@gmx.de \
--cc=memxor@gmail.com \
--cc=mgreer@animalcreek.com \
--cc=rppt@kernel.org \
--cc=rric@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=sudipm.mukherjee@gmail.com \
--cc=teddy.wang@siliconmotion.com \
--cc=tglx@linutronix.de \
--cc=vaibhav.sr@gmail.com \
--cc=vireshk@kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=wcohen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).