ALSA: pcm: oss: 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.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c
index 2fa9299a440dbb99e767c079e664d0a1133e8762..7cd09cef6961db34a381ddf90d8852c0ff194e30 100644 (file)
--- a/sound/core/oss/rate.c
+++ b/sound/core/oss/rate.c
@@ -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;