Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ac6a1a5 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 31f58e31

drivers/media/cec-edid.c

+4 −1
Original line number Diff line number Diff line
@@ -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);