Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: broonie@kernel.org
Cc: stuarth@opensource.cirrus.com, patches@opensource.cirrus.com,
	rf@opensource.cirrus.com, lgirdwood@gmail.com,
	alsa-devel@alsa-project.org
Subject: [PATCH 1/5] ASoC: wm_adsp: Correct algorithm list allocation size
Date: Thu, 19 Jul 2018 11:50:35 +0100	[thread overview]
Message-ID: <20180719105039.28312-1-ckeepax@opensource.cirrus.com> (raw)

Commit 6396bb221514 ("treewide: kzalloc() -> kcalloc()") was
overlooked when doing some refactoring to the algorithm list
handling, which lead to twice as much buffer being allocated
as required for reading the algorithm list. A kcalloc is no
longer appropriate since the allocation size is now in bytes
not registers, as such change back to kzalloc.

Fixes: 7f7cca08abf4 ("ASoC: wm_adsp: Simplify handling of alg offset and length")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
 sound/soc/codecs/wm_adsp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 07c17acc8a4f..99108d18de8d 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -1906,7 +1906,7 @@ static void *wm_adsp_read_algs(struct wm_adsp *dsp, size_t n_algs,
 	/* Convert length from DSP words to bytes */
 	len *= sizeof(u32);
 
-	alg = kcalloc(len, 2, GFP_KERNEL | GFP_DMA);
+	alg = kzalloc(len, GFP_KERNEL | GFP_DMA);
 	if (!alg)
 		return ERR_PTR(-ENOMEM);
 
-- 
2.11.0

             reply	other threads:[~2018-07-19 10:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-19 10:50 Charles Keepax [this message]
2018-07-19 10:50 ` [PATCH 2/5] ASoC: wm_adsp: Take prefix into account in control name length Charles Keepax
2018-07-19 16:57   ` Applied "ASoC: wm_adsp: Take prefix into account in control name length" to the asoc tree Mark Brown
2018-07-19 10:50 ` [PATCH 3/5] ASoC: wm_adsp: Ensure DSP boot work complete before preloader_put return Charles Keepax
2018-07-19 16:58   ` Applied "ASoC: wm_adsp: Ensure DSP boot work complete before preloader_put return" to the asoc tree Mark Brown
2018-07-19 10:50 ` [PATCH 4/5] ASoC: wm_adsp: Allow up to 8 channels for voice control Charles Keepax
2018-07-19 16:57   ` Applied "ASoC: wm_adsp: Allow up to 8 channels for voice control" to the asoc tree Mark Brown
2018-07-19 10:50 ` [PATCH 5/5] ASoC: wm_adsp: Parse HOST_BUFFER controls Charles Keepax
2018-07-19 16:57   ` Applied "ASoC: wm_adsp: Parse HOST_BUFFER controls" to the asoc tree Mark Brown
2018-07-19 16:57 ` Applied "ASoC: wm_adsp: Correct algorithm list allocation size" " Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180719105039.28312-1-ckeepax@opensource.cirrus.com \
    --to=ckeepax@opensource.cirrus.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=patches@opensource.cirrus.com \
    --cc=rf@opensource.cirrus.com \
    --cc=stuarth@opensource.cirrus.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox