diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2016-08-18 09:13:42 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-08-22 19:04:51 +0200 |
| commit | 8ac6a1a53e9f195e8c4336a7edfba2e102fc14bb (patch) | |
| tree | 4c8edff4f0f541bb3fd2ba744590a8643a5a145b | |
| parent | [media] pulse8-cec: fix error handling (diff) | |
| download | linux-8ac6a1a53e9f195e8c4336a7edfba2e102fc14bb.tar.xz linux-8ac6a1a53e9f195e8c4336a7edfba2e102fc14bb.zip | |
[media] cec-edid: check for IEEE identifier
The cec_get_edid_spa_location() function did not verify that the IEEE
identifier in the Vendor Specific Data Block matched the HDMI-LLC
identifier. This could result in the wrong VSDB block being returned.
For example, for HDMI 2.0 EDIDs there is also a HDMI Forum VSDB.
So check the IEEE identifier as well.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
| -rw-r--r-- | drivers/media/cec-edid.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/cec-edid.c b/drivers/media/cec-edid.c index 70018247bdda..5719b991e340 100644 --- a/drivers/media/cec-edid.c +++ b/drivers/media/cec-edid.c @@ -70,7 +70,10 @@ static unsigned int cec_get_edid_spa_location(const u8 *edid, unsigned int size) u8 tag = edid[i] >> 5; u8 len = edid[i] & 0x1f; - if (tag == 3 && len >= 5 && i + len <= end) + if (tag == 3 && len >= 5 && i + len <= end && + edid[i + 1] == 0x03 && + edid[i + 2] == 0x0c && + edid[i + 3] == 0x00) return i + 4; i += len + 1; } while (i < end); |