From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53AF46BB31; Tue, 23 Jan 2024 02:02:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705975361; cv=none; b=A76P+0q0ccp/SKsI3PNNxJMAvEFTvAt5v1XXTHwh7JMLEDjiZEQKUMme33PElWUxXpuKKb7cPbOZ2OyOlDqC3fuueCVa54d1oD8wHNANQH1qjXQCJRXwkIzlCQU5LS/EPyHa3YOL3tunmfmK7st4tqhb4SZzfsSZoaCSlqFO0gg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705975361; c=relaxed/simple; bh=nS5zCwqV29egVWnTWxTEFZxvjBV/SkjIm7Vx58LQsOk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iJLMyBAOi2MHpPKDQqko5JBBFUomPlLmfp9+vjm6eHGem7Vc2tzHv7Aq8Y/VrSVaZIK3Mh/6P+lIVH88mJdr+iyau0/+/4rHr+GOfR0mFdVvJFdrUI0gJipeZSEkTadoNc8T4ZSm3aIy0NUViuVuNmTL4Rqo4XVTwCkWeYZPOoU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p3nFgs/H; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="p3nFgs/H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19534C43394; Tue, 23 Jan 2024 02:02:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705975361; bh=nS5zCwqV29egVWnTWxTEFZxvjBV/SkjIm7Vx58LQsOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p3nFgs/HqgzazXhWuykNXdGg1GhKmqSPYdFa0QztyzUjxKwVhlA8FkdFNdLJ352u8 kYlIvPhZny5niPfzQ9f7lGg09I3m2LDgzEpQPZTQNQ9dm5off37Q1MMVw52t/xcwSd hRoE5C/0Gje/IOXt/LnmSnMPzwTHFKw2PeBiXwl0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Geoffrey D. Bennett" , Takashi Iwai , Sasha Levin Subject: [PATCH 6.6 323/583] ALSA: scarlett2: Add clamp() in scarlett2_mixer_ctl_put() Date: Mon, 22 Jan 2024 15:56:14 -0800 Message-ID: <20240122235821.933674468@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235812.238724226@linuxfoundation.org> References: <20240122235812.238724226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Geoffrey D. Bennett [ Upstream commit 04f8f053252b86c7583895c962d66747ecdc61b7 ] Ensure the value passed to scarlett2_mixer_ctl_put() is between 0 and SCARLETT2_MIXER_MAX_VALUE so we don't attempt to access outside scarlett2_mixer_values[]. Signed-off-by: Geoffrey D. Bennett Fixes: 9e4d5c1be21f ("ALSA: usb-audio: Scarlett Gen 2 mixer interface") Link: https://lore.kernel.org/r/3b19fb3da641b587749b85fe1daa1b4e696c0c1b.1703001053.git.g@b4.vu Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/mixer_scarlett_gen2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index 087e120d7103..c04cff722541 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -3361,7 +3361,8 @@ static int scarlett2_mixer_ctl_put(struct snd_kcontrol *kctl, mutex_lock(&private->data_mutex); oval = private->mix[index]; - val = ucontrol->value.integer.value[0]; + val = clamp(ucontrol->value.integer.value[0], + 0L, (long)SCARLETT2_MIXER_MAX_VALUE); num_mixer_in = port_count[SCARLETT2_PORT_TYPE_MIX][SCARLETT2_PORT_OUT]; mix_num = index / num_mixer_in; -- 2.43.0