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 7F3B27C6C5; Mon, 8 Apr 2024 13:34:01 +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=1712583241; cv=none; b=lDYbVmRfhOv9ApVLEn4dKnsq3q4Xkx3XdiHUMVr+q/vUa1PBQTwpnW9bybxf7mJjedTPLVZWTaAsS4k1TOTuJyQeK1NY3oSL9rPZ0QIopZYhpH1owF5T6pBOjlVuUQxN5mVNY7zPmJLusa8SWuHKeHp5odKHbqEvaj31JB4h0y8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712583241; c=relaxed/simple; bh=cc11txN4mMeI3esiWnjCNS4HTYT/01I0LX6y3q6O0QA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HtagznUfKGKSliTVkdgk4CHEnkmMwcAabOSTrjDFrubo5uJsbLYYTbRRlESRGdaCkRiC5MblcagIIu452ZXFsLff12lYj21VFEtABQ3ceFDL69I+T3guUVEihNeXFugb8rkhyQ8yQMCLQvc4eLIu8kOarGJ3WkUGfSFbSXgwPVU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ohnWeNBV; 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="ohnWeNBV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03FD8C433C7; Mon, 8 Apr 2024 13:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712583241; bh=cc11txN4mMeI3esiWnjCNS4HTYT/01I0LX6y3q6O0QA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ohnWeNBVDFxuWYQzk4VLz/apWq0/1HiCnFklgarjl4RBL3n2vzBpiIRbj7U4ya/4C 1ScQIxlyrhQhyWwJ5ALJTZmxPwPyg5vneNOIRoNJ92nmC+mH3fRRBEzjpdC+yjDOqM 1lTdH+fzPU0TCp1JXVLhrH/cKhF3QtahwnS0iraM= 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 6.6 173/252] ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw Date: Mon, 8 Apr 2024 14:57:52 +0200 Message-ID: <20240408125312.028034726@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125306.643546457@linuxfoundation.org> References: <20240408125306.643546457@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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: 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 2d25748ca7066..b27e89ff6a167 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -263,7 +263,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