lkml.org 
[lkml]   [2019]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 301/305] drm: Rewrite drm_ioctl_flags() to resemble the new drm_ioctl() code
    3.16.63-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Ville Syrjälä <ville.syrjala@linux.intel.com>

    commit 7ef5f82b100716b23de7d2da6ff602b0842e5804 upstream.

    Use the same logic when checking for valid ioctl range in
    drm_ioctl_flags() that is used in drm_ioctl() to avoid
    confusion.

    Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    [bwh: Backported to 3.16: adjust filename]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/gpu/drm/drm_drv.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    --- a/drivers/gpu/drm/drm_drv.c
    +++ b/drivers/gpu/drm/drm_drv.c
    @@ -460,12 +460,13 @@ EXPORT_SYMBOL(drm_ioctl);
    */
    bool drm_ioctl_flags(unsigned int nr, unsigned int *flags)
    {
    - if ((nr >= DRM_COMMAND_END && nr < DRM_CORE_IOCTL_COUNT) ||
    - (nr < DRM_COMMAND_BASE)) {
    - *flags = drm_ioctls[nr].flags;
    - return true;
    - }
    + if (nr >= DRM_COMMAND_BASE && nr < DRM_COMMAND_END)
    + return false;

    - return false;
    + if (nr >= DRM_CORE_IOCTL_COUNT)
    + return false;
    +
    + *flags = drm_ioctls[nr].flags;
    + return true;
    }
    EXPORT_SYMBOL(drm_ioctl_flags);
    \
     
     \ /
      Last update: 2019-02-03 15:26    [W:4.044 / U:0.580 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site