lkml.org 
[lkml]   [2017]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 180/319] drm: Reject page_flip for !DRIVER_MODESET
    Date
    From: Daniel Vetter <daniel.vetter@ffwll.ch>

    commit 6f00975c619064a18c23fd3aced325ae165a73b9 upstream.

    Somehow this one slipped through, which means drivers without modeset
    support can be oopsed (since those also don't call
    drm_mode_config_init, which means the crtc lookup will chase an
    uninitalized idr).

    Reported-by: Alexander Potapenko <glider@google.com>
    Cc: Alexander Potapenko <glider@google.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
    Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/gpu/drm/drm_crtc.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
    index c24c356..121680f 100644
    --- a/drivers/gpu/drm/drm_crtc.c
    +++ b/drivers/gpu/drm/drm_crtc.c
    @@ -3422,6 +3422,9 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
    int hdisplay, vdisplay;
    int ret = -EINVAL;

    + if (!drm_core_check_feature(dev, DRIVER_MODESET))
    + return -EINVAL;
    +
    if (page_flip->flags & ~DRM_MODE_PAGE_FLIP_FLAGS ||
    page_flip->reserved != 0)
    return -EINVAL;
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-02-05 20:26    [W:4.040 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site