From: Takashi Iwai <tiwai@suse.de>
To: Hongbo Li <lihongbo22@huawei.com>
Cc: <perex@perex.cz>, <tiwai@suse.com>, <linux-sound@vger.kernel.org>
Subject: Re: [PATCH -next] ALSA: pcm: replace simple_strtoul to kstrtoul
Date: Fri, 30 Aug 2024 10:22:48 +0200 [thread overview]
Message-ID: <87frqml8rr.wl-tiwai@suse.de> (raw)
In-Reply-To: <20240830080135.3544948-1-lihongbo22@huawei.com>
On Fri, 30 Aug 2024 10:01:35 +0200,
Hongbo Li wrote:
>
> As mentioned in [1], "...simple_strtol(), simple_strtoll(),
> simple_strtoul(), and simple_strtoull() functions explicitly
> ignore overflows, which may lead to unexpected results in callers."
> Hence, the use of those functions is discouraged.
>
> This patch replace the use of the simple_strtoul with the safer
> alternatives kstrtoul.
>
> [1] https://www.kernel.org/doc/html/latest/process/deprecated.html#simple-strtol-simple-strtoll-simple-strtoul-simple-strtoull
>
> Signed-off-by: Hongbo Li <lihongbo22@huawei.com>
> ---
> sound/core/pcm_memory.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/sound/core/pcm_memory.c b/sound/core/pcm_memory.c
> index 8e4c68e3bbd0..fea8bed02604 100644
> --- a/sound/core/pcm_memory.c
> +++ b/sound/core/pcm_memory.c
> @@ -185,6 +185,7 @@ static void snd_pcm_lib_preallocate_proc_write(struct snd_info_entry *entry,
> char line[64], str[64];
> size_t size;
> struct snd_dma_buffer new_dmab;
> + int ret;
>
> guard(mutex)(&substream->pcm->open_mutex);
> if (substream->runtime) {
> @@ -193,8 +194,10 @@ static void snd_pcm_lib_preallocate_proc_write(struct snd_info_entry *entry,
> }
> if (!snd_info_get_line(buffer, line, sizeof(line))) {
> snd_info_get_str(str, line, sizeof(str));
> - size = simple_strtoul(str, NULL, 10) * 1024;
> - if ((size != 0 && size < 8192) || size > substream->dma_max) {
> + ret = kstrtoul(str, 10, &size);
> + size *= 1024;
> + if ((ret != 0) || (size != 0 && size < 8192) ||
The parentheses around "ret != 0" is superfluous.
And you can set the value to buffer->error, too.
That said, it's better not to put the ret value check in that if
block, but put another check right after kstrtoul() call.
thanks,
Takashi
next prev parent reply other threads:[~2024-08-30 8:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-30 8:01 [PATCH -next] ALSA: pcm: replace simple_strtoul to kstrtoul Hongbo Li
2024-08-30 8:22 ` Takashi Iwai [this message]
2024-08-31 1:19 ` Hongbo Li
2024-08-31 7:47 ` Takashi Iwai
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=87frqml8rr.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=lihongbo22@huawei.com \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.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