diff options
author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-05-23 10:58:00 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-05-28 15:51:46 +0100 |
commit | b11c5b5e573968d69aa9fec7507de7aa8fbf76e6 (patch) | |
tree | 736a9378d5058c8f2c69f29a8badcb0bee2b63ca /sound/soc/sof/loader.c | |
parent | 99afc8df8b6f2d039b1ab20d879e4721068a6c34 (diff) | |
download | linux-b11c5b5e573968d69aa9fec7507de7aa8fbf76e6.tar.bz2 |
ASoC: SOF: Use struct_size() in kmemdup()
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 code of the following form:
sizeof(*w) + sizeof(struct sof_ipc_window_elem) * w->num_windows
with:
struct_size(w, window, w->num_windows)
Notice that variable size is unnecessary, hence it is removed.
This code was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/loader.c')
-rw-r--r-- | sound/soc/sof/loader.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c index 628fae552442..16b016b76fd8 100644 --- a/sound/soc/sof/loader.c +++ b/sound/soc/sof/loader.c @@ -19,15 +19,13 @@ static int get_ext_windows(struct snd_sof_dev *sdev, { struct sof_ipc_window *w = container_of(ext_hdr, struct sof_ipc_window, ext_hdr); - size_t size; if (w->num_windows == 0 || w->num_windows > SOF_IPC_MAX_ELEMS) return -EINVAL; - size = sizeof(*w) + sizeof(struct sof_ipc_window_elem) * w->num_windows; - /* keep a local copy of the data */ - sdev->info_window = kmemdup(w, size, GFP_KERNEL); + sdev->info_window = kmemdup(w, struct_size(w, window, w->num_windows), + GFP_KERNEL); if (!sdev->info_window) return -ENOMEM; |