diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2016-02-05 09:05:41 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-02 15:18:58 -0500 |
| commit | 1393cc31874b005282d502c0d505901576482e16 (patch) | |
| tree | 39595478f8a51658adfa0a7a9878fc53a90c9dd9 | |
| parent | c68a347cced544d1b3c4abab26573d2a316aec87 (diff) | |
| download | lwn-1393cc31874b005282d502c0d505901576482e16.tar.gz lwn-1393cc31874b005282d502c0d505901576482e16.zip | |
ALSA: hda - Fix static checker warning in patch_hdmi.c
[ Upstream commit 360a8245680053619205a3ae10e6bfe624a5da1d ]
The static checker warning is:
sound/pci/hda/patch_hdmi.c:460 hdmi_eld_ctl_get()
error: __memcpy() 'eld->eld_buffer' too small (256 vs 512)
I have a hard time figuring out if this can ever cause an information leak
(I don't think so), but nonetheless it does not hurt to increase the
robustness of the code.
Fixes: 68e03de98507 ('ALSA: hda - hdmi: Do not expose eld data when eld is invalid')
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Cc: <stable@vger.kernel.org> # v3.9+
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 99e952293498..8e8ccde973df 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -435,7 +435,8 @@ static int hdmi_eld_ctl_get(struct snd_kcontrol *kcontrol, eld = &per_pin->sink_eld; mutex_lock(&per_pin->lock); - if (eld->eld_size > ARRAY_SIZE(ucontrol->value.bytes.data)) { + if (eld->eld_size > ARRAY_SIZE(ucontrol->value.bytes.data) || + eld->eld_size > ELD_MAX_SIZE) { mutex_unlock(&per_pin->lock); snd_BUG(); return -EINVAL; |