| Message ID | 20210315013908.217219-1-nick.desaulniers@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bef2897d31b97852d80b38e9376ed5ef3a90b309 |
| Headers | show |
| Series | [v3] ASoC: Intel: Skylake: skl-topology: fix -frame-larger-than | expand |
On Sun, Mar 14, 2021 at 06:39:08PM -0700, Nick Desaulniers wrote: > Fixes: > sound/soc/intel/skylake/skl-topology.c:3613:13: warning: stack frame > size of 1304 bytes in function 'skl_tplg_complete' > [-Wframe-larger-than=] Changelogs like this look like Fixes: tags and confuse tools which attempt to parse them, please don't just put a Fixes: at the start of the line.
On Sun, 14 Mar 2021 18:39:08 -0700, Nick Desaulniers wrote: > Fixes: > sound/soc/intel/skylake/skl-topology.c:3613:13: warning: stack frame > size of 1304 bytes in function 'skl_tplg_complete' > [-Wframe-larger-than=] > > struct snd_ctl_elem_value is 1224 bytes in my configuration. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: Intel: Skylake: skl-topology: fix -frame-larger-than commit: bef2897d31b97852d80b38e9376ed5ef3a90b309 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 --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index b824086203b9..c0fdab39e7c2 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3613,10 +3613,15 @@ static int skl_manifest_load(struct snd_soc_component *cmpnt, int index, static void skl_tplg_complete(struct snd_soc_component *component) { struct snd_soc_dobj *dobj; - struct snd_soc_acpi_mach *mach = - dev_get_platdata(component->card->dev); + struct snd_soc_acpi_mach *mach; + struct snd_ctl_elem_value *val; int i; + val = kmalloc(sizeof(*val), GFP_KERNEL); + if (!val) + return; + + mach = dev_get_platdata(component->card->dev); list_for_each_entry(dobj, &component->dobj_list, list) { struct snd_kcontrol *kcontrol = dobj->control.kcontrol; struct soc_enum *se; @@ -3632,14 +3637,14 @@ static void skl_tplg_complete(struct snd_soc_component *component) sprintf(chan_text, "c%d", mach->mach_params.dmic_num); for (i = 0; i < se->items; i++) { - struct snd_ctl_elem_value val = {}; - if (strstr(texts[i], chan_text)) { - val.value.enumerated.item[0] = i; - kcontrol->put(kcontrol, &val); + memset(val, 0, sizeof(*val)); + val->value.enumerated.item[0] = i; + kcontrol->put(kcontrol, val); } } } + kfree(val); } static struct snd_soc_tplg_ops skl_tplg_ops = {
Fixes: sound/soc/intel/skylake/skl-topology.c:3613:13: warning: stack frame size of 1304 bytes in function 'skl_tplg_complete' [-Wframe-larger-than=] struct snd_ctl_elem_value is 1224 bytes in my configuration. Heap allocate it, then free it within the current frame. Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com> --- Changes V2 -> V3: * change to kmalloc+memset to fix logic error, as per Andy. Changes V1 -> V2: * rebased on mainline. sound/soc/intel/skylake/skl-topology.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) base-commit: 88fe49249c99de14e543c632a46248d85411ab9e