firmware: cs_dsp: Fix new control name check

Before adding a new FW control, its name is checked against
existing controls list. But the string length in strncmp used
to compare controls names is taken from the list, so if beginnings
of the controls are matching,  then the new control is not created.
For example, if CAL_R control already exists, CAL_R_SELECTED
is not created.
The fix is to compare string lengths as well.

Fixes: 6477960755fb ("ASoC: wm_adsp: Move check for control existence")
Signed-off-by: Vlad Karpovich <vkarpovi@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230815172908.3454056-1-vkarpovi@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/firmware/cirrus/cs_dsp.c b/drivers/firmware/cirrus/cs_dsp.c
index 6a9aa97373d37f2403d5e1bfa4e9121017beaa33..49b70c70dc6960b79cc69e5f382a9fdd3e8b9c2e 100644 (file)
--- a/drivers/firmware/cirrus/cs_dsp.c
+++ b/drivers/firmware/cirrus/cs_dsp.c
@@ -978,7 +978,8 @@ static int cs_dsp_create_control(struct cs_dsp *dsp,
                    ctl->alg_region.alg == alg_region->alg &&
                    ctl->alg_region.type == alg_region->type) {
                        if ((!subname && !ctl->subname) ||
-                           (subname && !strncmp(ctl->subname, subname, ctl->subname_len))) {
+                           (subname && (ctl->subname_len == subname_len) &&
+                            !strncmp(ctl->subname, subname, ctl->subname_len))) {
                                if (!ctl->enabled)
                                        ctl->enabled = 1;
                                return 0;