diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2016-02-05 11:05:41 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-02-15 19:07:54 +0300 |
| commit | c1dd92fbc262dc6b53d7fcc941164916dc3a73ac (patch) | |
| tree | 2f3db9f73a89aff11163751a722665553b6b7173 | |
| parent | 059f1b15518f4d8725340c869a8d63518406c5e0 (diff) | |
| download | linux-c1dd92fbc262dc6b53d7fcc941164916dc3a73ac.tar.xz | |
ALSA: hda - Fix static checker warning in patch_hdmi.c
commit 360a8245680053619205a3ae10e6bfe624a5da1d upstream.
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -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 830021f4aa06..c527d9756ef5 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -394,7 +394,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; |