Unverified Commit b9f902b7 authored Dec 31, 2017 by Banajit Goswami Committed by Mark Brown Jan 03, 2018

ASoC: change mask in snd_soc_get/put_volsw_sx to unsigned int



If the result of (min + max) is negative in functions
snd_soc_get_volsw_sx() or snd_soc_put_volsw_sx(), there
will be an overflow for the variable 'mask'.
   UBSAN: Undefined behaviour in sound/soc/soc-ops.c:382:6
   signed integer overflow:
   -2147483648 - 1 cannot be represented in type 'int'

Fix this by updating the variable type of 'mask' to unsigned int.

Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent cb2cf0de

sound/soc/soc-ops.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -378,7 +378,7 @@ int snd_soc_get_volsw_sx(struct snd_kcontrol *kcontrol,
		unsigned int rshift = mc->rshift;
		int max = mc->max;
		int min = mc->min;
		int mask = (1 << (fls(min + max) - 1)) - 1;
		unsigned int mask = (1 << (fls(min + max) - 1)) - 1;
		unsigned int val;
		int ret;

		@@ -423,7 +423,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
		unsigned int rshift = mc->rshift;
		int max = mc->max;
		int min = mc->min;
		int mask = (1 << (fls(min + max) - 1)) - 1;
		unsigned int mask = (1 << (fls(min + max) - 1)) - 1;
		int err = 0;
		unsigned int val, val_mask, val2 = 0;

Admin message