diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2012-10-17 12:43:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-21 09:28:01 -0700 |
| commit | bb4e97376e84d98994a5f576e2bd080d3aeee232 (patch) | |
| tree | 870a9df57630a164c3520d1c663b009d97711375 /sound | |
| parent | 7ec51fc74149ac5caafffce2b065e25ef621e2c1 (diff) | |
| download | linux-3.10-bb4e97376e84d98994a5f576e2bd080d3aeee232.tar.gz linux-3.10-bb4e97376e84d98994a5f576e2bd080d3aeee232.tar.bz2 linux-3.10-bb4e97376e84d98994a5f576e2bd080d3aeee232.zip | |
ALSA: hda - Always check array bounds in alc_get_line_out_pfx
commit 71aa5ebe36a4e936eff281b375a4707b6a8320f2 upstream.
Even when CONFIG_SND_DEBUG is not enabled, we don't want to
return an arbitrary memory location when the channel count is
larger than we expected.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 94747f8a249..94b765b31ea 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2665,8 +2665,10 @@ static const char *alc_get_line_out_pfx(struct alc_spec *spec, int ch, return "PCM"; break; } - if (snd_BUG_ON(ch >= ARRAY_SIZE(channel_name))) + if (ch >= ARRAY_SIZE(channel_name)) { + snd_BUG(); return "PCM"; + } return channel_name[ch]; } |