• Kees Cook's avatar
    drm/dp: Fix OOB read when handling Post Cursor2 register · a2151490
    Kees Cook authored
    The link_status array was not large enough to read the Adjust Request
    Post Cursor2 register, so remove the common helper function to avoid
    an OOB read, found with a -Warray-bounds build:
    
    drivers/gpu/drm/drm_dp_helper.c: In function 'drm_dp_get_adjust_request_post_cursor':
    drivers/gpu/drm/drm_dp_helper.c:59:27: error: array subscript 10 is outside array bounds of 'const u8[6]' {aka 'const unsigned char[6]'} [-Werror=array-bounds]
       59 |         return link_status[r - DP_LANE0_1_STATUS];
          |                ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~
    drivers/gpu/drm/drm_dp_helper.c:147:51: note: while referencing 'link_status'
      147 | u8 drm_dp_get_adjust_request_post_cursor(const u8 link_status[DP_LINK_STATUS_SIZE],
          |                                          ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    Replace the only user of the helper with an open-coded fetch and decode,
    similar to drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c.
    
    Cc: Daniel Vetter <daniel@ffwll.ch>
    Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
    Cc: Maxime Ripard <mripard@kernel.org>
    Cc: Thomas Zimmermann <tzimmermann@suse.de>
    Cc: David Airlie <airlied@linux.ie>
    Cc: dri-devel@lists.freedesktop.org
    Fixes: 79465e0f ("drm/dp: Add helper to get post-cursor adjustments")
    Signed-off-by: default avatarKees Cook <keescook@chromium.org>
    Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
    Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
    Link: https://lore.kernel.org/r/20220105173507.2420910-1-keescook@chromium.orgSigned-off-by: default avatarThierry Reding <treding@nvidia.com>
    a2151490
dp.c 21.2 KB