Merge branch '5.6/fixes' into 5.6/master

heftig · heftig · commit 4ef7cf2c9ab2 · 2020-04-08T09:16:38.000+02:00
* 5.6/fixes:
  ALSA: hda: Fix potential access overflow in beep helper
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
@@ -290,8 +290,12 @@ int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,
 {
 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
 	struct hda_beep *beep = codec->beep;
+	int chs = get_amp_channels(kcontrol);
+
 	if (beep && (!beep->enabled || !ctl_has_mute(kcontrol))) {
-		ucontrol->value.integer.value[0] =
+		if (chs & 1)
+			ucontrol->value.integer.value[0] = beep->enabled;
+		if (chs & 2)
 			ucontrol->value.integer.value[1] = beep->enabled;
 		return 0;
 	}

Original file line number	Diff line number	Diff line change
`@@ -290,8 +290,12 @@ int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,`
`290`	`290`	`{`
`291`	`291`	`struct hda_codec *codec = snd_kcontrol_chip(kcontrol);`
`292`	`292`	`struct hda_beep *beep = codec->beep;`
	`293`	`+ int chs = get_amp_channels(kcontrol);`
	`294`	`+`
`293`	`295`	`if (beep && (!beep->enabled \|\| !ctl_has_mute(kcontrol))) {`
`294`		`- ucontrol->value.integer.value[0] =`
	`296`	`+ if (chs & 1)`
	`297`	`+ ucontrol->value.integer.value[0] = beep->enabled;`
	`298`	`+ if (chs & 2)`
`295`	`299`	`ucontrol->value.integer.value[1] = beep->enabled;`
`296`	`300`	`return 0;`
`297`	`301`	`}`