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 1EFCA80034; Mon, 8 Apr 2024 14:05:22 +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=1712585122; cv=none; b=Esa0lOfKFsxbPyLojC/L3jZwrt8zgv1ggF7LagtkLQBjJOIVYWDgM/NrSTn80VYFjPSKQ03s6wSm7iY/w33+WPkflZsEIhBAUF7PF6JB5dEKOjeLgXK7OG1+TGcbjwcb7QG9t1OAWLBVABGu81XA+ZdMvKLChXqcD0I8tqdYXXg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712585122; c=relaxed/simple; bh=2/Mt5RY+vt9z0+N1MI0LVkaZkvNY4lwrgF9QTceYHO8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hIADteasSZ5Xvg9EoQGE/P4dm/ogjokkSUZFtdScGVSXgala1krnqDigGpr+virFTkebV5prvVvZiT7mOnOanaXPbepkqy8i+v9RwAsgyCvGskUkVAVpLQ0W2dSbZrRkiaraTOuu8vn135pANEesVru9s7vm87Hj4Xy1vZgrdTU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NLcLFayQ; 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="NLcLFayQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94B5BC433F1; Mon, 8 Apr 2024 14:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712585122; bh=2/Mt5RY+vt9z0+N1MI0LVkaZkvNY4lwrgF9QTceYHO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NLcLFayQxZ6TgzFJCo3lavH2hDEVsynd6VetH+sjzoDquJYLsyQIDA0cfsDKNETlL fbrUkVlEXq8jp/FqQ1+VNkJ5MmrVg8+q71CBXuAHBRzmNTUeto3dVfnueHv2bWjve2 MmW72ltGzimr5fC3/t5ePCdK0A4KGETzaOzMnCfQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stephen Lee , Mark Brown , Sasha Levin Subject: [PATCH 5.15 670/690] ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw Date: Mon, 8 Apr 2024 14:58:56 +0200 Message-ID: <20240408125423.987312849@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125359.506372836@linuxfoundation.org> References: <20240408125359.506372836@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stephen Lee [ Upstream commit fc563aa900659a850e2ada4af26b9d7a3de6c591 ] In snd_soc_info_volsw(), mask is generated by figuring out the index of the most significant bit set in max and converting the index to a bitmask through bit shift 1. Unintended wraparound occurs when max is an integer value with msb bit set. Since the bit shift value 1 is treated as an integer type, the left shift operation will wraparound and set mask to 0 instead of all 1's. In order to fix this, we type cast 1 as `1ULL` to prevent the wraparound. Fixes: 7077148fb50a ("ASoC: core: Split ops out of soc-core.c") Signed-off-by: Stephen Lee Link: https://msgid.link/r/20240326010131.6211-1-slee08177@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index c56379fac9272..57caa91a4376e 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -246,7 +246,7 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, int max = mc->max; int min = mc->min; int sign_bit = mc->sign_bit; - unsigned int mask = (1 << fls(max)) - 1; + unsigned int mask = (1ULL << fls(max)) - 1; unsigned int invert = mc->invert; int val; int ret; -- 2.43.0