]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
firmware: cs_dsp: Don't allow writes to read-only controls
authorRichard Fitzgerald <rf@opensource.cirrus.com>
Tue, 2 Jul 2024 11:08:09 +0000 (12:08 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Sep 2024 09:11:35 +0000 (11:11 +0200)
[ Upstream commit 62412a9357b16a4e39dc582deb2e2a682b92524c ]

Add a check to cs_dsp_coeff_write_ctrl() to abort if the control
is not writeable.

The cs_dsp code originated as an ASoC driver (wm_adsp) where all
controls were exported as ALSA controls. It relied on ALSA to
enforce the read-only permission. Now that the code has been
separated from ALSA/ASoC it must perform its own permission check.

This isn't currently causing any problems so there shouldn't be any
need to backport this. If the client of cs_dsp exposes the control as
an ALSA control, it should set permissions on that ALSA control to
protect it. The few uses of cs_dsp_coeff_write_ctrl() inside drivers
are for writable controls.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://patch.msgid.link/20240702110809.16836-1-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/firmware/cirrus/cs_dsp.c

index a1da7581adb038bb46877f227c5888542760377d..e62ffffe5fb8d4af875d97e33c3ed2059144e9ac 100644 (file)
@@ -796,6 +796,9 @@ int cs_dsp_coeff_write_ctrl(struct cs_dsp_coeff_ctl *ctl,
 
        lockdep_assert_held(&ctl->dsp->pwr_lock);
 
+       if (ctl->flags && !(ctl->flags & WMFW_CTL_FLAG_WRITEABLE))
+               return -EPERM;
+
        if (len + off * sizeof(u32) > ctl->len)
                return -EINVAL;