| Message ID | 20231221091605.14660-1-dmantipov@yandex.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ALSA: seq: fix kvmalloc_array() arguments order | expand |
On Thu, 21 Dec 2023 10:16:00 +0100, Dmitry Antipov wrote: > > When compiling with gcc version 14.0.0 20231220 (experimental) > and W=1, I've noticed the following warning: > > sound/core/seq/seq_memory.c: In function 'snd_seq_pool_init': > sound/core/seq/seq_memory.c:445:41: warning: 'kvmalloc_array' sizes specified with > 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args] > 445 | cellptr = kvmalloc_array(sizeof(struct snd_seq_event_cell), pool->size, > | ^~~~~~ > > Since 'n' and 'size' arguments of 'kvmalloc_array()' are multiplied > to calculate the final size, their actual order doesn't affect the > result and so this is not a bug. But it's still worth to fix it. > > Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> Applied, thanks. Takashi
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index b603bb93f896..e705e7538118 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c @@ -442,7 +442,8 @@ int snd_seq_pool_init(struct snd_seq_pool *pool) if (snd_BUG_ON(!pool)) return -EINVAL; - cellptr = kvmalloc_array(sizeof(struct snd_seq_event_cell), pool->size, + cellptr = kvmalloc_array(pool->size, + sizeof(struct snd_seq_event_cell), GFP_KERNEL); if (!cellptr) return -ENOMEM;
When compiling with gcc version 14.0.0 20231220 (experimental) and W=1, I've noticed the following warning: sound/core/seq/seq_memory.c: In function 'snd_seq_pool_init': sound/core/seq/seq_memory.c:445:41: warning: 'kvmalloc_array' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 445 | cellptr = kvmalloc_array(sizeof(struct snd_seq_event_cell), pool->size, | ^~~~~~ Since 'n' and 'size' arguments of 'kvmalloc_array()' are multiplied to calculate the final size, their actual order doesn't affect the result and so this is not a bug. But it's still worth to fix it. Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru> --- sound/core/seq/seq_memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)