From: Rosen Penev <rosenp@gmail.com>
To: linux-sound@vger.kernel.org
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>, Kees Cook <kees@kernel.org>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
linux-kernel@vger.kernel.org (open list),
linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not
covered by other areas):Keyword:\b__counted_by(_le|_be)?\b)
Subject: [PATCH] ASoC: pcm6240: Use flexible array for config blocks
Date: Mon, 11 May 2026 16:13:13 -0700 [thread overview]
Message-ID: <20260511231313.31929-1-rosenp@gmail.com> (raw)
Store the per-config block pointer table in the config allocation
instead of allocating it separately.
This ties the table to the config object lifetime and removes the
extra allocation and free path.
Assisted-by: Codex:GPT-5.5
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
sound/soc/codecs/pcm6240.c | 36 +++++++++++++++---------------------
sound/soc/codecs/pcm6240.h | 2 +-
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/sound/soc/codecs/pcm6240.c b/sound/soc/codecs/pcm6240.c
index 78b21fbfad50..667596fc1781 100644
--- a/sound/soc/codecs/pcm6240.c
+++ b/sound/soc/codecs/pcm6240.c
@@ -1230,15 +1230,11 @@ static struct pcmdevice_config_info *pcmdevice_add_config(void *ctxt,
int *status)
{
struct pcmdevice_priv *pcm_dev = (struct pcmdevice_priv *)ctxt;
- struct pcmdevice_config_info *cfg_info;
+ struct pcmdevice_config_info *cfg_info = NULL;
struct pcmdevice_block_data **bk_da;
+ char cfg_name[64] = {};
unsigned int config_offset = 0, i;
-
- cfg_info = kzalloc_obj(struct pcmdevice_config_info);
- if (!cfg_info) {
- *status = -ENOMEM;
- goto out;
- }
+ unsigned int nblocks;
if (pcm_dev->regbin.fw_hdr.binary_version_num >= 0x105) {
if (config_offset + 64 > (int)config_size) {
@@ -1247,7 +1243,7 @@ static struct pcmdevice_config_info *pcmdevice_add_config(void *ctxt,
"%s: cfg_name out of boundary\n", __func__);
goto out;
}
- memcpy(cfg_info->cfg_name, &config_data[config_offset], 64);
+ memcpy(cfg_name, &config_data[config_offset], 64);
config_offset += 64;
}
@@ -1257,16 +1253,17 @@ static struct pcmdevice_config_info *pcmdevice_add_config(void *ctxt,
__func__);
goto out;
}
- cfg_info->nblocks =
- get_unaligned_be32(&config_data[config_offset]);
+ nblocks = get_unaligned_be32(&config_data[config_offset]);
config_offset += 4;
- bk_da = cfg_info->blk_data = kzalloc_objs(struct pcmdevice_block_data *,
- cfg_info->nblocks);
- if (!bk_da) {
+ cfg_info = kzalloc_flex(*cfg_info, blk_data, nblocks);
+ if (!cfg_info) {
*status = -ENOMEM;
goto out;
}
+ cfg_info->nblocks = nblocks;
+ memcpy(cfg_info->cfg_name, cfg_name, sizeof(cfg_info->cfg_name));
+ bk_da = cfg_info->blk_data;
cfg_info->real_nblocks = 0;
for (i = 0; i < cfg_info->nblocks; i++) {
if (config_offset + 12 > config_size) {
@@ -1449,14 +1446,11 @@ static void pcmdevice_config_info_remove(void *ctxt)
for (i = 0; i < regbin->ncfgs; i++) {
if (!cfg_info[i])
continue;
- if (cfg_info[i]->blk_data) {
- for (j = 0; j < (int)cfg_info[i]->real_nblocks; j++) {
- if (!cfg_info[i]->blk_data[j])
- continue;
- kfree(cfg_info[i]->blk_data[j]->regdata);
- kfree(cfg_info[i]->blk_data[j]);
- }
- kfree(cfg_info[i]->blk_data);
+ for (j = 0; j < (int)cfg_info[i]->real_nblocks; j++) {
+ if (!cfg_info[i]->blk_data[j])
+ continue;
+ kfree(cfg_info[i]->blk_data[j]->regdata);
+ kfree(cfg_info[i]->blk_data[j]);
}
kfree(cfg_info[i]);
}
diff --git a/sound/soc/codecs/pcm6240.h b/sound/soc/codecs/pcm6240.h
index 2d8f9e798139..e27afd33910c 100644
--- a/sound/soc/codecs/pcm6240.h
+++ b/sound/soc/codecs/pcm6240.h
@@ -199,7 +199,7 @@ struct pcmdevice_config_info {
unsigned int nblocks;
unsigned int real_nblocks;
unsigned char active_dev;
- struct pcmdevice_block_data **blk_data;
+ struct pcmdevice_block_data *blk_data[] __counted_by(nblocks);
};
struct pcmdevice_regbin {
--
2.54.0
reply other threads:[~2026-05-11 23:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20260511231313.31929-1-rosenp@gmail.com \
--to=rosenp@gmail.com \
--cc=broonie@kernel.org \
--cc=gustavoars@kernel.org \
--cc=kees@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.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