Skip to contentSkip to conversation

ALSA: Use struct_size() helper

PATCH In review Gustavo A. R. Silva 2 participants 2 messages May 23, 2019 – May 24, 2019 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: Use struct_size() helper

Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.

So, replace the following form:

sizeof(struct rate_priv) + src_format->channels * sizeof(struct rate_channel)

with:

struct_size(data, channels, src_format->channels)

This code was detected with the help of Coccinelle.

---
 sound/core/oss/rate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/core/oss/rate.c +2 -2
index 2fa9299a440d..7cd09cef6961 100644
@@ -323,8 +323,8 @@ int snd_pcm_plugin_build_rate(struct snd_pcm_substream *plug,
 
 	err = snd_pcm_plugin_build(plug, "rate conversion",
 				   src_format, dst_format,
-				   sizeof(struct rate_priv) +
-				   src_format->channels * sizeof(struct rate_channel),
+				   struct_size(data, channels,
+					       src_format->channels),
 				   &plugin);
 	if (err < 0)
 		return err;
Signature · 1 line
2.21.0
#1 lore raw
Quoted 9 lines · Gustavo A. R. Silva

Make use of the struct_size() helper instead of an open-coded version in order to avoid any potential type mistakes, in particular in the context in which this code is being used.

So, replace the following form:

sizeof(struct rate_priv) + src_format->channels * sizeof(struct rate_channel)

Quoted 7 lines

with:

struct_size(data, channels, src_format->channels)

This code was detected with the help of Coccinelle.

Applied now, thanks.

Takashi