Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/edid: In connector_bad_edid() cap num_of_ext by num_blocks read

In commit e11f5bd8228f ("drm: Add support for DP 1.4 Compliance edid
corruption test") the function connector_bad_edid() started assuming
that the memory for the EDID passed to it was big enough to hold
`edid[0x7e] + 1` blocks of data (1 extra for the base block). It
completely ignored the fact that the function was passed `num_blocks`
which indicated how much memory had been allocated for the EDID.

Let's fix this by adding a bounds check.

This is important for handling the case where there's an error in the
first block of the EDID. In that case we will call
connector_bad_edid() without having re-allocated memory based on
`edid[0x7e]`.

Fixes: e11f5bd8228f ("drm: Add support for DP 1.4 Compliance edid corruption test")
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211005192905.v2.1.Ib059f9c23c2611cb5a9d760e7d0a700c1295928d@changeid
Signed-off-by: Dave Airlie <airlied@redhat.com>

authored by

Douglas Anderson and committed by
Dave Airlie
97794170 6011106d

+12 -3
+12 -3
drivers/gpu/drm/drm_edid.c
··· 1834 1834 u8 *edid, int num_blocks) 1835 1835 { 1836 1836 int i; 1837 - u8 num_of_ext = edid[0x7e]; 1837 + u8 last_block; 1838 + 1839 + /* 1840 + * 0x7e in the EDID is the number of extension blocks. The EDID 1841 + * is 1 (base block) + num_ext_blocks big. That means we can think 1842 + * of 0x7e in the EDID of the _index_ of the last block in the 1843 + * combined chunk of memory. 1844 + */ 1845 + last_block = edid[0x7e]; 1838 1846 1839 1847 /* Calculate real checksum for the last edid extension block data */ 1840 - connector->real_edid_checksum = 1841 - drm_edid_block_checksum(edid + num_of_ext * EDID_LENGTH); 1848 + if (last_block < num_blocks) 1849 + connector->real_edid_checksum = 1850 + drm_edid_block_checksum(edid + last_block * EDID_LENGTH); 1842 1851 1843 1852 if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS)) 1844 1853 return;