lkml.org 
[lkml]   [2012]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 166/270] ALSA: hda - Always check array bounds in alc_get_line_out_pfx
    Date
    3.5.7u1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: David Henningsson <david.henningsson@canonical.com>

    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: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    sound/pci/hda/patch_realtek.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
    index f6784d7..2549f0b 100644
    --- a/sound/pci/hda/patch_realtek.c
    +++ b/sound/pci/hda/patch_realtek.c
    @@ -2486,8 +2486,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];
    }
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-11-26 19:01    [W:4.075 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site