Unverified Commit b11c5b5e authored May 23, 2019 by Gustavo A. R. Silva Committed by Mark Brown May 28, 2019

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>

parent 99afc8df

sound/soc/sof/loader.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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;

Admin message