diff mbox series

[v2] ASoC: Intel: avs: Use struct_size for struct avs_modcfg_ext size

Message ID 20230303180457.2457069-1-jacob.e.keller@intel.com
State Accepted
Commit c9ef0fee3bdf8197538aadc728e475fceba113bb
Headers show
Series [v2] ASoC: Intel: avs: Use struct_size for struct avs_modcfg_ext size | expand

Commit Message

Keller, Jacob E March 3, 2023, 6:04 p.m. UTC 
The struct avs_modcfg_ext structure has a flexible array member for the
pin_fmts array, and the size should be calculated using struct_size to
prevent the potential for overflow with the allocation.

Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: "Amadeusz Sławiński" <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
---
 sound/soc/intel/avs/path.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: ee3f96b164688dae21e2466a57f2e806b64e8a37

Comments

Mark Brown March 6, 2023, 1:32 p.m. UTC | #1 
On Fri, 03 Mar 2023 10:04:57 -0800, Jacob Keller wrote:
> The struct avs_modcfg_ext structure has a flexible array member for the
> pin_fmts array, and the size should be calculated using struct_size to
> prevent the potential for overflow with the allocation.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: Intel: avs: Use struct_size for struct avs_modcfg_ext size
      commit: c9ef0fee3bdf8197538aadc728e475fceba113bb

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c
index 05302ab705ae..adbe23a47847 100644
--- a/sound/soc/intel/avs/path.c
+++ b/sound/soc/intel/avs/path.c
@@ -478,7 +478,7 @@  static int avs_modext_create(struct avs_dev *adev, struct avs_path_module *mod)
 	int ret, i;
 
 	num_pins = tcfg->generic.num_input_pins + tcfg->generic.num_output_pins;
-	cfg_size = sizeof(*cfg) + sizeof(*cfg->pin_fmts) * num_pins;
+	cfg_size = struct_size(cfg, pin_fmts, num_pins);
 
 	cfg = kzalloc(cfg_size, GFP_KERNEL);
 	if (!cfg)