From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Takashi Iwai <tiwai@suse.de>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org,
Takashi Iwai <tiwai@suse.com>
Subject: Re: [PATCH][next] ALSA: vmaster: Use flex_array_size() helper in memcpy()
Date: Thu, 30 Jul 2020 08:12:33 -0500 [thread overview]
Message-ID: <96ea053c-f4c9-56dd-0d44-b627b067405f@embeddedor.com> (raw)
In-Reply-To: <s5h1rkte6ni.wl-tiwai@suse.de>
On 7/30/20 03:41, Takashi Iwai wrote:
> On Thu, 30 Jul 2020 00:18:29 +0200,
> Gustavo A. R. Silva wrote:
>>
>> Make use of the flex_array_size() helper to calculate the size of a
>> flexible array member within an enclosing structure.
>>
>> This helper offers defense-in-depth against potential integer overflows
>> and makes it explicitly clear that we are dealing with a flexible array
>> member.
>>
>> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
>> ---
>> sound/core/vmaster.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c
>> index ab36f9898711..21ce4082cb5f 100644
>> --- a/sound/core/vmaster.c
>> +++ b/sound/core/vmaster.c
>> @@ -262,7 +262,8 @@ int _snd_ctl_add_follower(struct snd_kcontrol *master,
>> return -ENOMEM;
>> srec->kctl = follower;
>> srec->follower = *follower;
>> - memcpy(srec->follower.vd, follower->vd, follower->count * sizeof(*follower->vd));
>> + memcpy(srec->follower.vd, follower->vd, flex_array_size(srec, follower.vd,
>> + srec->follower.count));
>
> Changing from follower->count to srec->follower.count isn't obvious,
> so it should have been mentioned in the log; other than that, the code
> change looks good.
>
Yeah; you're right. I'll include that in the changelog text.
> But since the API isn't in Linus tree yet, I'll postpone the merge
> until the API reaches to upstream. Maybe I can merge this during RC1
> merge window, as those are trivial.
>
The API is already in mainline, see:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/linux/overflow.h#n320
>
> BTW, looking at those patterns, I wonder whether it'd make sense to
> make the whole memset() call as a macro like
>
> safe_copy_array(srec->follower.vd, follower->vd, follower->count);
>
> ?
>
Yep; I was actually thinking about that, yesterday. I might implement it
for the next development cycle. :)
Thanks for the feedback.
--
Gustavo
next prev parent reply other threads:[~2020-07-30 13:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 22:18 [PATCH][next] ALSA: vmaster: Use flex_array_size() helper in memcpy() Gustavo A. R. Silva
2020-07-30 8:41 ` Takashi Iwai
2020-07-30 13:12 ` Gustavo A. R. Silva [this message]
2020-07-30 14:57 ` 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=96ea053c-f4c9-56dd-0d44-b627b067405f@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=alsa-devel@alsa-project.org \
--cc=gustavoars@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tiwai@suse.com \
--cc=tiwai@suse.de \
/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).