diff options
| author | Wu Fengguang | 2009-07-17 10:49:19 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2009-07-17 11:18:21 +0200 |
| commit | 6430aeeb30b478d4ef25f988b1fde6f6ae83adb5 (patch) | |
| tree | d9888582ec7a4bb9c6e7f3a52be543c408c2d742 /sound | |
| parent | ALSA: hda - Add support for new AMD HD audio devices (diff) | |
| download | kernel-qcow2-linux-6430aeeb30b478d4ef25f988b1fde6f6ae83adb5.tar.gz kernel-qcow2-linux-6430aeeb30b478d4ef25f988b1fde6f6ae83adb5.tar.xz kernel-qcow2-linux-6430aeeb30b478d4ef25f988b1fde6f6ae83adb5.zip | |
ALSA: hda - add bounds checking for the codec command fields
A recent bug involves passing auto detected >0x7f NID to codec command,
creating an invalid codec addr field, and finally lead to cmd timeout
and fall back into single command mode. Jaroslav fixed that bug in
alc880_parse_auto_config().
It would be safer to further check the bounds of all cmd fields.
Cc: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index ec352c6ae49a..d9d326297834 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -150,7 +150,14 @@ make_codec_cmd(struct hda_codec *codec, hda_nid_t nid, int direct, { u32 val; - val = (u32)(codec->addr & 0x0f) << 28; + if ((codec->addr & ~0xf) | (direct & ~1) | (nid & ~0x7f) | + (verb & ~0xfff) | (parm & ~0xff)) { + printk(KERN_ERR "hda-codec: out of range cmd %x:%x:%x:%x:%x\n", + codec->addr, direct, nid, verb, parm); + return ~0; + } + + val = (u32)codec->addr << 28; val |= (u32)direct << 27; val |= (u32)nid << 20; val |= verb << 8; @@ -167,6 +174,9 @@ static int codec_exec_verb(struct hda_codec *codec, unsigned int cmd, struct hda_bus *bus = codec->bus; int err; + if (cmd == ~0) + return -1; + if (res) *res = -1; again: |