Unverified Commit f102707f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9710 CVE-2022-48738 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jialin Zhang <zhangjialin11@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6Q5ZA5RH6VFLDEICGI7QAUBWB2BEDNN5/ 
Marek Vasut (1):
  ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min

Mark Brown (1):
  ASoC: ops: Reject out of bounds values in snd_soc_put_volsw()


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/IA72DZ 
 
Link:https://gitee.com/openeuler/kernel/pulls/9710

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents e97ac089 eae46d78

sound/soc/soc-ops.c

+16 −2
Original line number Diff line number Diff line
@@ -322,13 +322,27 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, 
	if (sign_bit)

		mask = BIT(sign_bit + 1) - 1;



	val = ((ucontrol->value.integer.value[0] + min) & mask);

	val = ucontrol->value.integer.value[0];

	if (mc->platform_max && ((int)val + min) > mc->platform_max)

		return -EINVAL;

	if (val > max - min)

		return -EINVAL;

	if (val < 0)

		return -EINVAL;

	val = (val + min) & mask;

	if (invert)

		val = max - val;

	val_mask = mask << shift;

	val = val << shift;

	if (snd_soc_volsw_is_stereo(mc)) {

		val2 = ((ucontrol->value.integer.value[1] + min) & mask);

		val2 = ucontrol->value.integer.value[1];

		if (mc->platform_max && ((int)val2 + min) > mc->platform_max)

			return -EINVAL;

		if (val2 > max - min)

			return -EINVAL;

		if (val2 < 0)

			return -EINVAL;

		val2 = (val2 + min) & mask;

		if (invert)

			val2 = max - val2;

		if (reg == reg2) {