public inbox for patches@lists.linux.dev
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	patches@lists.linux.dev, Mark Brown <broonie@kernel.org>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 6.0 08/16] ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx()
Date: Thu, 15 Dec 2022 19:10:52 +0100	[thread overview]
Message-ID: <20221215172908.518761443@linuxfoundation.org> (raw)
In-Reply-To: <20221215172908.162858817@linuxfoundation.org>

From: Mark Brown <broonie@kernel.org>

[ Upstream commit 97eea946b93961fffd29448dcda7398d0d51c4b2 ]

The bounds checks in snd_soc_put_volsw_sx() are only being applied to the
first channel, meaning it is possible to write out of bounds values to the
second channel in stereo controls. Add appropriate checks.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220511134137.169575-2-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 sound/soc/soc-ops.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
index 47691119306f..1970bda074d8 100644
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -468,6 +468,12 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
 
 		val_mask = mask << rshift;
 		val2 = (ucontrol->value.integer.value[1] + min) & mask;
+
+		if (mc->platform_max && val2 > mc->platform_max)
+			return -EINVAL;
+		if (val2 > max)
+			return -EINVAL;
+
 		val2 = val2 << rshift;
 
 		err = snd_soc_component_update_bits(component, reg2, val_mask,
-- 
2.35.1




  parent reply	other threads:[~2022-12-15 18:13 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-15 18:10 [PATCH 6.0 00/16] 6.0.14-rc1 review Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 01/16] rtc: cmos: Fix event handler registration ordering issue Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 02/16] rtc: cmos: Fix wake alarm breakage Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 03/16] x86/vdso: Conditionally export __vdso_sgx_enter_enclave() Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 04/16] libbpf: Fix uninitialized warning in btf_dump_dump_type_data Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 05/16] rtc: cmos: fix build on non-ACPI platforms Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 06/16] ASoC: fsl_micfil: explicitly clear software reset bit Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 07/16] ASoC: fsl_micfil: explicitly clear CHnF flags Greg Kroah-Hartman
2022-12-15 18:10 ` Greg Kroah-Hartman [this message]
2022-12-15 18:10 ` [PATCH 6.0 09/16] libbpf: Use page size as max_entries when probing ring buffer map Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 10/16] pinctrl: meditatek: Startup with the IRQs disabled Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 11/16] can: sja1000: fix size of OCR_MODE_MASK define Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 12/16] can: mcba_usb: Fix termination command argument Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 13/16] net: fec: dont reset irq coalesce settings to defaults on "ip link up" Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 14/16] ASoC: cs42l51: Correct PGA Volume minimum value Greg Kroah-Hartman
2022-12-15 18:10 ` [PATCH 6.0 15/16] perf: Fix perf_pending_task() UaF Greg Kroah-Hartman
2022-12-15 18:11 ` [PATCH 6.0 16/16] nvme-pci: clear the prp2 field when not used Greg Kroah-Hartman
2022-12-15 23:45 ` [PATCH 6.0 00/16] 6.0.14-rc1 review Shuah Khan
2022-12-16  9:51 ` Bagas Sanjaya
2022-12-16 10:08 ` Allen Pais
2022-12-16 10:28 ` Naresh Kamboju
2022-12-16 11:13 ` Ron Economos
2022-12-16 13:05 ` Jon Hunter
2022-12-16 13:15 ` Sudip Mukherjee (Codethink)
2022-12-16 20:57 ` Florian Fainelli
2022-12-16 22:24 ` Guenter Roeck

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=20221215172908.518761443@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=broonie@kernel.org \
    --cc=patches@lists.linux.dev \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    /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