From: Charles Keepax <ckeepax@opensource.cirrus.com>
To: <broonie@kernel.org>
Cc: <lgirdwood@gmail.com>, <shenghao-ding@ti.com>, <kevin-lu@ti.com>,
<baojun.xu@ti.com>, <linux-sound@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <patches@opensource.cirrus.com>
Subject: [PATCH 05/15] ASoC: ops: Factor out helper to check valid control values
Date: Tue, 18 Mar 2025 17:14:49 +0000 [thread overview]
Message-ID: <20250318171459.3203730-6-ckeepax@opensource.cirrus.com> (raw)
In-Reply-To: <20250318171459.3203730-1-ckeepax@opensource.cirrus.com>
Most of the put handlers have identical code to verify the value passed
in from user-space. Factor this out into a single helper function.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
sound/soc/soc-ops.c | 82 ++++++++++++++++++++++++---------------------
1 file changed, 43 insertions(+), 39 deletions(-)
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
index 54945017e1f1e..53a141426a967 100644
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -158,6 +158,20 @@ static void snd_soc_read_signed(struct snd_soc_component *component,
*signed_val = ret;
}
+static int soc_mixer_valid_ctl(struct soc_mixer_control *mc, long val, int max)
+{
+ if (val < 0)
+ return -EINVAL;
+
+ if (mc->platform_max && val > mc->platform_max)
+ return -EINVAL;
+
+ if (val > max)
+ return -EINVAL;
+
+ return 0;
+}
+
static int soc_mixer_mask(struct soc_mixer_control *mc)
{
if (mc->sign_bit)
@@ -330,26 +344,24 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
unsigned int val2 = 0;
unsigned int val, val_mask;
- if (ucontrol->value.integer.value[0] < 0)
- return -EINVAL;
+ ret = soc_mixer_valid_ctl(mc, ucontrol->value.integer.value[0],
+ mc->max - mc->min);
+ if (ret)
+ return ret;
+
val = ucontrol->value.integer.value[0];
- if (mc->platform_max && val > mc->platform_max)
- return -EINVAL;
- if (val > max - min)
- return -EINVAL;
val = (val + min) & mask;
if (invert)
val = max - val;
val_mask = mask << shift;
val = val << shift;
if (snd_soc_volsw_is_stereo(mc)) {
- if (ucontrol->value.integer.value[1] < 0)
- return -EINVAL;
+ ret = soc_mixer_valid_ctl(mc, ucontrol->value.integer.value[1],
+ mc->max - mc->min);
+ if (ret)
+ return ret;
+
val2 = ucontrol->value.integer.value[1];
- if (mc->platform_max && val2 > mc->platform_max)
- return -EINVAL;
- if (val2 > max - min)
- return -EINVAL;
val2 = (val2 + min) & mask;
if (invert)
val2 = max - val2;
@@ -435,19 +447,16 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
unsigned int shift = mc->shift;
unsigned int rshift = mc->rshift;
unsigned int val, val_mask;
- int max = mc->max;
int min = mc->min;
unsigned int mask = soc_mixer_sx_mask(mc);
int err = 0;
int ret;
- if (ucontrol->value.integer.value[0] < 0)
- return -EINVAL;
+ ret = soc_mixer_valid_ctl(mc, ucontrol->value.integer.value[0], mc->max);
+ if (ret)
+ return ret;
+
val = ucontrol->value.integer.value[0];
- if (mc->platform_max && val > mc->platform_max)
- return -EINVAL;
- if (val > max)
- return -EINVAL;
val_mask = mask << shift;
val = (val + min) & mask;
val = val << shift;
@@ -458,13 +467,14 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
ret = err;
if (snd_soc_volsw_is_stereo(mc)) {
- unsigned int val2 = ucontrol->value.integer.value[1];
+ unsigned int val2;
- if (mc->platform_max && val2 > mc->platform_max)
- return -EINVAL;
- if (val2 > max)
- return -EINVAL;
+ ret = soc_mixer_valid_ctl(mc, ucontrol->value.integer.value[1],
+ mc->max);
+ if (ret)
+ return ret;
+ val2 = ucontrol->value.integer.value[1];
val_mask = mask << rshift;
val2 = (val2 + min) & mask;
val2 = val2 << rshift;
@@ -534,15 +544,12 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
unsigned int mask = soc_mixer_mask(mc);
unsigned int invert = mc->invert;
unsigned int val, val_mask;
- int err, ret, tmp;
+ int err, ret;
- tmp = ucontrol->value.integer.value[0];
- if (tmp < 0)
- return -EINVAL;
- if (mc->platform_max && tmp > mc->platform_max)
- return -EINVAL;
- if (tmp > mc->max - mc->min)
- return -EINVAL;
+ ret = soc_mixer_valid_ctl(mc, ucontrol->value.integer.value[0],
+ mc->max - mc->min);
+ if (ret)
+ return ret;
if (invert)
val = (max - ucontrol->value.integer.value[0]) & mask;
@@ -557,13 +564,10 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol,
ret = err;
if (snd_soc_volsw_is_stereo(mc)) {
- tmp = ucontrol->value.integer.value[1];
- if (tmp < 0)
- return -EINVAL;
- if (mc->platform_max && tmp > mc->platform_max)
- return -EINVAL;
- if (tmp > mc->max - mc->min)
- return -EINVAL;
+ ret = soc_mixer_valid_ctl(mc, ucontrol->value.integer.value[1],
+ mc->max - mc->min);
+ if (ret)
+ return ret;
if (invert)
val = (max - ucontrol->value.integer.value[1]) & mask;
--
2.39.5
next prev parent reply other threads:[~2025-03-18 17:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-18 17:14 [PATCH 00/15] Tidy up ASoC control get and put handlers Charles Keepax
2025-03-18 17:14 ` [PATCH 01/15] ASoC: ops-test: Add some basic kunit tests for soc-ops Charles Keepax
2025-03-18 17:14 ` [PATCH 02/15] ASoC: ops: Minor formatting fixups Charles Keepax
2025-03-18 17:14 ` [PATCH 03/15] ASoC: ops: Update comments for xr_sx control helpers Charles Keepax
2025-03-18 17:14 ` [PATCH 04/15] ASoC: ops: Update mask generation to use GENMASK Charles Keepax
2025-03-18 17:14 ` Charles Keepax [this message]
2025-03-18 17:14 ` [PATCH 06/15] ASoC: ops: Replace snd_soc_read_signed() with new helper Charles Keepax
2025-03-18 17:14 ` [PATCH 07/15] ASoC: ops: Add control to register value helper Charles Keepax
2025-03-18 17:14 ` [PATCH 08/15] ASoC: ops: Remove snd_soc_info_volsw_range() Charles Keepax
2025-03-18 17:14 ` [PATCH 09/15] ASoC: ops: Remove snd_soc_get_volsw_range() Charles Keepax
2025-03-18 17:14 ` [PATCH 10/15] ASoC: ops: Remove snd_soc_put_volsw_range() Charles Keepax
2025-03-18 17:14 ` [PATCH 11/15] ASoC: ops: Factor out common code from info callbacks Charles Keepax
2025-03-18 17:14 ` [PATCH 12/15] ASoC: ops: Factor out common code from put callbacks Charles Keepax
2025-03-18 17:14 ` [PATCH 13/15] ASoC: ops: Factor out common code from get callbacks Charles Keepax
2025-03-19 15:12 ` Mark Brown
2025-03-19 16:04 ` Charles Keepax
2025-03-19 16:08 ` Mark Brown
2025-03-18 17:14 ` [PATCH 14/15] ASoC: ops: Remove some unnecessary local variables Charles Keepax
2025-03-18 17:14 ` [PATCH 15/15] ASoC: ops: Apply platform_max after deciding control type Charles Keepax
2025-03-20 18:45 ` [PATCH 00/15] Tidy up ASoC control get and put handlers Mark Brown
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=20250318171459.3203730-6-ckeepax@opensource.cirrus.com \
--to=ckeepax@opensource.cirrus.com \
--cc=baojun.xu@ti.com \
--cc=broonie@kernel.org \
--cc=kevin-lu@ti.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=shenghao-ding@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.