From: Lee Jones <lee@kernel.org>
To: lee@kernel.org, Vinod Koul <vkoul@kernel.org>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>,
Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: [PATCH 15/21] soundwire: amd: Avoid static port offset leak in amd_sdw_compute_params()
Date: Fri, 30 Oct 2026 10:46:54 +0000 [thread overview]
Message-ID: <20261030104840.3361217-16-lee@kernel.org> (raw)
In-Reply-To: <20261030104840.3361217-1-lee@kernel.org>
amd_sdw_compute_params() tracks the next dynamic port block offset in a
static next_offset[] array initialised with {1} (which also leaves
instance 1 initialised to 0). Because next_offset[] is static and
never reset when streams are freed or when the driver is unbound and
rebound, the offset grows monotonically across stream lifecycles until
it exceeds max_slots - 1 and permanently fails with -ENOMEM.
Compute next_offset locally in amd_sdw_compute_params() from the active
ports on the bus and clear port_offset_map[dai->id] in
amd_sdw_hw_free().
Fixes: 27ab4f1e4909 ("soundwire: amd: refactor bandwidth calculation logic")
Closes: https://sashiko.dev/#/bug/linux-a0378066-b3cf-426c-bc88-e4d5208965b9
Cc: stable@vger.kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>
---
drivers/soundwire/amd_manager.c | 48 +++++++++++++++++++++++++++++----
1 file changed, 43 insertions(+), 5 deletions(-)
diff --git a/drivers/soundwire/amd_manager.c b/drivers/soundwire/amd_manager.c
index 9dfcdde3f2f0..98b09d81f3b8 100644
--- a/drivers/soundwire/amd_manager.c
+++ b/drivers/soundwire/amd_manager.c
@@ -469,6 +469,41 @@ static u32 amd_sdw_read_ping_status(struct sdw_bus *bus)
return slave_stat;
}
+static unsigned int amd_sdw_find_free_port_offset(struct sdw_bus *bus,
+ unsigned int slot_size)
+{
+ struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
+ struct sdw_master_runtime *m_rt;
+ struct sdw_port_runtime *p_rt;
+ unsigned int next_offset = 1;
+ bool overlap;
+
+ do {
+ overlap = false;
+ list_for_each_entry(m_rt, &bus->m_rt_list, bus_node) {
+ unsigned int other_size = m_rt->stream->params.bps *
+ m_rt->stream->params.ch_count;
+
+ list_for_each_entry(p_rt, &m_rt->port_list, port_node) {
+ unsigned int other_bo;
+
+ if (p_rt->num >= amd_manager->max_ports)
+ continue;
+ other_bo = amd_manager->port_offset_map[p_rt->num];
+ if (!other_bo)
+ continue;
+ if (next_offset < other_bo + other_size &&
+ other_bo < next_offset + slot_size) {
+ next_offset = other_bo + other_size;
+ overlap = true;
+ }
+ }
+ }
+ } while (overlap);
+
+ return next_offset;
+}
+
static int amd_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime *stream)
{
struct amd_sdw_manager *amd_manager = to_amd_sdw(bus);
@@ -479,8 +514,7 @@ static int amd_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime
int port_bo, hstart, hstop, sample_int;
unsigned int rate, bps, channels;
unsigned int stream_slot_size, max_slots;
- static unsigned int next_offset[AMD_SDW_MAX_MANAGER_COUNT] = {1};
- unsigned int inst_id = amd_manager->instance;
+ unsigned int next_offset;
port_bo = 0;
hstart = 1;
@@ -511,11 +545,13 @@ static int amd_sdw_compute_params(struct sdw_bus *bus, struct sdw_stream_runtime
*/
if (bus->params.curr_dr_freq == 12000000) {
max_slots = bus->params.row * (bus->params.col - 1);
- if (next_offset[inst_id] + stream_slot_size <=
+ next_offset =
+ amd_sdw_find_free_port_offset(bus,
+ stream_slot_size);
+ if (next_offset + stream_slot_size <=
(max_slots - 1)) {
amd_manager->port_offset_map[p_rt->num] =
- next_offset[inst_id];
- next_offset[inst_id] += stream_slot_size;
+ next_offset;
} else {
dev_err(bus->dev,
"No space for port %d\n", p_rt->num);
@@ -824,6 +860,8 @@ static int amd_sdw_hw_free(struct snd_pcm_substream *substream, struct snd_soc_d
if (ret < 0)
dev_err(dai->dev, "remove manager from stream %s failed: %d\n",
dai_runtime->stream->name, ret);
+ if (dai->id >= 0 && dai->id < amd_manager->max_ports)
+ amd_manager->port_offset_map[dai->id] = 0;
return ret;
}
--
2.56.0.317.g454f8302e1-goog
next prev parent reply other threads:[~2026-10-30 10:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-30 10:46 [PATCH 00/21] soundwire: Fix Critical and High issues reported by Sashiko Lee Jones
2026-10-30 10:46 ` [PATCH 01/21] soundwire: bus: Hold bus_lock when looking up slave devices Lee Jones
2026-10-30 10:46 ` [PATCH 02/21] soundwire: sysfs: Use sysfs_emit_at() in array show callbacks Lee Jones
2026-10-30 10:46 ` [PATCH 03/21] soundwire: stream: Prevent m_rt_count underflow in sdw_stream_remove_master() Lee Jones
2026-10-30 11:09 ` sashiko-bot
2026-10-30 10:46 ` [PATCH 04/21] soundwire: stream: Clean up allocated runtime resources on config failure Lee Jones
2026-10-30 10:46 ` [PATCH 05/21] ASoC: SOF: Intel: hda-sdw-bpt: Stop active DMA before closing BPT streams Lee Jones
2026-10-30 10:46 ` [PATCH 06/21] soundwire: intel_ace2x: Protect bus.bpt_stream with bus_lock Lee Jones
2026-10-30 10:46 ` [PATCH 07/21] soundwire: qcom: Prevent pconfig buffer overflow in qcom_swrm_stream_alloc_ports() Lee Jones
2026-10-30 10:46 ` [PATCH 08/21] soundwire: qcom: Disable runtime PM and avoid clock underflow in qcom_swrm_remove() Lee Jones
2026-10-30 10:46 ` [PATCH 09/21] soundwire: qcom: Check clk_prepare_enable() return value Lee Jones
2026-10-30 10:46 ` [PATCH 10/21] soundwire: qcom: Serialise ctrl->intr_mask updates Lee Jones
2026-10-30 10:46 ` [PATCH 11/21] soundwire: qcom: Prevent stale broadcast IRQ from completing subsequent command Lee Jones
2026-10-30 10:46 ` [PATCH 12/21] soundwire: amd: Check for NULL manager drvdata in sdw_amd_startup() Lee Jones
2026-10-30 10:46 ` [PATCH 13/21] soundwire: amd: Check ping command response for timeout Lee Jones
2026-10-30 10:46 ` [PATCH 14/21] soundwire: amd: Preserve lane control bits in amd_sdw_port_enable() Lee Jones
2026-10-30 10:46 ` Lee Jones [this message]
2026-10-30 10:46 ` [PATCH 16/21] soundwire: amd: Initialise and cancel IRQ work around manager lifetime Lee Jones
2026-10-30 10:46 ` [PATCH 17/21] soundwire: amd: Resume manager before hardware teardown in amd_sdw_manager_remove() Lee Jones
2026-10-30 10:46 ` [PATCH 18/21] soundwire: amd: Synchronise parent IRQ and disable work on manager removal Lee Jones
2026-10-30 10:46 ` [PATCH 19/21] soundwire: amd: Cancel pending work before suspending manager Lee Jones
2026-10-30 10:46 ` [PATCH 20/21] soundwire: amd: Check clock resume timeout in amd_resume_runtime() Lee Jones
2026-10-30 10:47 ` [PATCH 21/21] soundwire: amd: Disable interrupts if enabling manager fails Lee Jones
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=20261030104840.3361217-16-lee@kernel.org \
--to=lee@kernel.org \
--cc=Vijendar.Mukunda@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=pierre-louis.bossart@linux.dev \
--cc=stable@vger.kernel.org \
--cc=vkoul@kernel.org \
--cc=yung-chuan.liao@linux.intel.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