From: Baoli Zhang <baoli.zhang@linux.intel.com>
To: Vinod Koul <vkoul@kernel.org>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Cc: "Baoli.Zhang" <baoli.zhang@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH RESEND v1 2/3] soundwire: increase group->max_size after allocation
Date: Wed, 6 May 2026 13:50:36 +0800 [thread overview]
Message-ID: <20260506055039.3751028-3-baoli.zhang@linux.intel.com> (raw)
In-Reply-To: <20260506055039.3751028-1-baoli.zhang@linux.intel.com>
From: "Baoli.Zhang" <baoli.zhang@linux.intel.com>
Only update `group->max_size` after both allocations succeed to avoid
leaving the group's state inconsistent if one allocation fails.
Signed-off-by: Baoli.Zhang <baoli.zhang@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/soundwire/generic_bandwidth_allocation.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/soundwire/generic_bandwidth_allocation.c b/drivers/soundwire/generic_bandwidth_allocation.c
index f016ad088a1db..cd9ccbaf0e46f 100644
--- a/drivers/soundwire/generic_bandwidth_allocation.c
+++ b/drivers/soundwire/generic_bandwidth_allocation.c
@@ -308,9 +308,8 @@ static int sdw_add_element_group_count(struct sdw_group *group,
unsigned int *rates;
unsigned int *lanes;
- group->max_size += 1;
rates = krealloc(group->rates,
- (sizeof(int) * group->max_size),
+ sizeof(int) * (group->max_size + 1),
GFP_KERNEL);
if (!rates)
return -ENOMEM;
@@ -318,12 +317,14 @@ static int sdw_add_element_group_count(struct sdw_group *group,
group->rates = rates;
lanes = krealloc(group->lanes,
- (sizeof(int) * group->max_size),
+ sizeof(int) * (group->max_size + 1),
GFP_KERNEL);
if (!lanes)
return -ENOMEM;
group->lanes = lanes;
+
+ group->max_size += 1;
}
group->rates[group->count] = rate;
--
2.43.0
next prev parent reply other threads:[~2026-05-06 5:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20260506055039.3751028-1-baoli.zhang@linux.intel.com>
2026-05-06 5:50 ` [PATCH RESEND v1 1/3] soundwire: fix bug in sdw_add_element_group_count found by syzkaller Baoli Zhang
2026-05-07 7:41 ` Vinod Koul
2026-05-06 5:50 ` Baoli Zhang [this message]
2026-05-06 5:50 ` [PATCH RESEND v1 3/3] soundwire: use krealloc_array to prevent integer overflow Baoli Zhang
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=20260506055039.3751028-3-baoli.zhang@linux.intel.com \
--to=baoli.zhang@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=pierre-louis.bossart@linux.dev \
--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