diff options
| author | Banajit Goswami <bgoswami@codeaurora.org> | 2017-12-31 20:40:14 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-03 12:32:04 +0000 |
| commit | b9f902b7fd800214b5598a636ceb74bfe2db63be (patch) | |
| tree | db5c986c5f8502e7256d35a935c268934906b760 /sound | |
| parent | cb2cf0de1174701b7c8c0285a0f398b9f2d30d8e (diff) | |
| download | talos-obmc-linux-b9f902b7fd800214b5598a636ceb74bfe2db63be.tar.gz talos-obmc-linux-b9f902b7fd800214b5598a636ceb74bfe2db63be.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 500f98c730b9..7144a51ddfa9 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -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; |
