| Message ID | 20210805050706.46833-1-samuel@sholland.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 36a9d79e5e9518dfd9548e3237e7a49464c16922 |
| Headers | show |
| Series | ASoC: simple-card-utils: Avoid over-allocating DLCs | expand |
Hi Samuel Thank you for your patch > The allocation of the DAI link components (DLCs) passed the wrong > pointer to sizeof. Since simple_dai_props is much larger than > snd_soc_dai_link_component, there was no out of bounds access, only > wasted memory. > > Signed-off-by: Samuel Holland <samuel@sholland.org> > --- Wow indeed ! Thank you for your fixup Fixes: f2138aed231c8 ("ASoC: simple-card-utils: enable flexible CPU/Codec/Platform") Fixes: 050c7950fd706 ("ASoC: simple-card-utils: alloc dai_link information for CPU/Codec/Platform") Reviewed-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > sound/soc/generic/simple-card-utils.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c > index 677f7da93b4b..10c63b73900c 100644 > --- a/sound/soc/generic/simple-card-utils.c > +++ b/sound/soc/generic/simple-card-utils.c > @@ -640,8 +640,8 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, > cnf_num += li->num[i].codecs; > } > > - dais = devm_kcalloc(dev, dai_num, sizeof(*dais), GFP_KERNEL); > - dlcs = devm_kcalloc(dev, dlc_num, sizeof(*dai_props), GFP_KERNEL); > + dais = devm_kcalloc(dev, dai_num, sizeof(*dais), GFP_KERNEL); > + dlcs = devm_kcalloc(dev, dlc_num, sizeof(*dlcs), GFP_KERNEL); > if (!dais || !dlcs) > return -ENOMEM; > > -- > 2.31.1 >
On Thu, Aug 05, 2021 at 02:14:53PM +0900, Kuninori Morimoto wrote:
> Reviewed-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
If you put spaces at the start of the line then none of the tooling will
pick up tags you add.
On Thu, 5 Aug 2021 00:07:06 -0500, Samuel Holland wrote: > The allocation of the DAI link components (DLCs) passed the wrong > pointer to sizeof. Since simple_dai_props is much larger than > snd_soc_dai_link_component, there was no out of bounds access, only > wasted memory. > > > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: simple-card-utils: Avoid over-allocating DLCs commit: 36a9d79e5e9518dfd9548e3237e7a49464c16922 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/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 677f7da93b4b..10c63b73900c 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -640,8 +640,8 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv, cnf_num += li->num[i].codecs; } - dais = devm_kcalloc(dev, dai_num, sizeof(*dais), GFP_KERNEL); - dlcs = devm_kcalloc(dev, dlc_num, sizeof(*dai_props), GFP_KERNEL); + dais = devm_kcalloc(dev, dai_num, sizeof(*dais), GFP_KERNEL); + dlcs = devm_kcalloc(dev, dlc_num, sizeof(*dlcs), GFP_KERNEL); if (!dais || !dlcs) return -ENOMEM;
The allocation of the DAI link components (DLCs) passed the wrong pointer to sizeof. Since simple_dai_props is much larger than snd_soc_dai_link_component, there was no out of bounds access, only wasted memory. Signed-off-by: Samuel Holland <samuel@sholland.org> --- sound/soc/generic/simple-card-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)