Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6f9bd4a authored by Stephen Lee's avatar Stephen Lee Committed by Greg Kroah-Hartman
Browse files

ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw 



[ 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: 7077148f ("ASoC: core: Split ops out of soc-core.c")
Signed-off-by: default avatarStephen Lee <slee08177@gmail.com>
Link: https://msgid.link/r/20240326010131.6211-1-slee08177@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 06a939f7

sound/soc/soc-ops.c

+1 −1
Original line number Diff line number Diff line
@@ -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;