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 A583514601D; Thu, 11 Apr 2024 10:22:04 +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=1712830924; cv=none; b=RNw+jbttB6IRXv9xrVphu1aNGXAodEaNh3fz0xlPx6tnS2nR+tEt8udwKyrh/foTdgN7hP0vMcF2pG4YGgoO7Dx4M1cBCnzfoiOy49tmcofOpwdDaIRd0bG8rtIm0Nqpa3jvsJiPW4iY1jDLAiyqa2Frmjnos7hgc4f9D1OCCFU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712830924; c=relaxed/simple; bh=l3RDIezpCKjZQm9sHypHJnttBeGQ5Ju0WejjQZuc/yw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bl1BKC/gJTRlSVPNVZCde0PPurEmj7v07UcsGp5BMSIf9hmLBBK/TpYDERq1e4pYqfIxjd/3yNx6PuxCPqAFymSFKVwVSSXDF2p6BTtdyGKm5aYRYUlIiUe/jRbsWu+7l8qOhbMmRkSgYtstP5j63xTKXjuN+PC7HudS/8IozJY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ejdEB9cn; 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="ejdEB9cn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2E5BC433C7; Thu, 11 Apr 2024 10:22:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712830924; bh=l3RDIezpCKjZQm9sHypHJnttBeGQ5Ju0WejjQZuc/yw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ejdEB9cnXVX1sI2iHLbB/P8ti0AMZBDFn9rUgRBO/XsmYoJ7sA3OXhLxs2vPvG/Mz rJB85UmIgzvMEUDY5UTXcvJWEZ+xUCVL81D8uNEnyLPApOih/sUZ6KwFjt5s+908HG Sg8CRK+jtOkirQgoUIwY/lt/V//DSQjYNQsFIPvc= 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.4 165/215] ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw Date: Thu, 11 Apr 2024 11:56:14 +0200 Message-ID: <20240411095429.834699434@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095424.875421572@linuxfoundation.org> References: <20240411095424.875421572@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.4-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 e01f3bf3ef171..08ed973b2d975 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -252,7 +252,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