ASoC: Intel: avs: Use struct_size for struct avs_modcfg_ext size
authorJacob Keller <jacob.e.keller@intel.com>
Fri, 3 Mar 2023 18:04:57 +0000 (10:04 -0800)
committerMark Brown <broonie@kernel.org>
Sun, 5 Mar 2023 23:38:32 +0000 (23:38 +0000)
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>
Link: https://lore.kernel.org/r/20230303180457.2457069-1-jacob.e.keller@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/avs/path.c

index 05302ab..adbe23a 100644 (file)
@@ -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)