lkml.org 
[lkml]   [2012]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 020/135] drm: Check for invalid cursor flags
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jakob Bornecrantz <jakob@vmware.com>

    commit 7c4eaca4162d0b5ad4fb39f974d7ffd71b9daa09 upstream.

    Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/gpu/drm/drm_crtc.c | 2 +-
    include/drm/drm_mode.h | 5 +++--
    2 files changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
    index 08a7aa7..6fbfc24 100644
    --- a/drivers/gpu/drm/drm_crtc.c
    +++ b/drivers/gpu/drm/drm_crtc.c
    @@ -1981,7 +1981,7 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,
    if (!drm_core_check_feature(dev, DRIVER_MODESET))
    return -EINVAL;

    - if (!req->flags)
    + if (!req->flags || (~DRM_MODE_CURSOR_FLAGS & req->flags))
    return -EINVAL;

    mutex_lock(&dev->mode_config.mutex);
    diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
    index 5581980..3d6301b 100644
    --- a/include/drm/drm_mode.h
    +++ b/include/drm/drm_mode.h
    @@ -359,8 +359,9 @@ struct drm_mode_mode_cmd {
    struct drm_mode_modeinfo mode;
    };

    -#define DRM_MODE_CURSOR_BO (1<<0)
    -#define DRM_MODE_CURSOR_MOVE (1<<1)
    +#define DRM_MODE_CURSOR_BO 0x01
    +#define DRM_MODE_CURSOR_MOVE 0x02
    +#define DRM_MODE_CURSOR_FLAGS 0x03

    /*
    * depending on the value in flags different members are used.



    \
     
     \ /
      Last update: 2012-09-17 03:21    [W:2.188 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site