lkml.org 
[lkml]   [2017]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 021/124] drm/vmwgfx: fix integer overflow in vmw_surface_define_ioctl()
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

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

    From: Li Qiang <liq3ea@gmail.com>

    commit e7e11f99564222d82f0ce84bd521e57d78a6b678 upstream.

    In vmw_surface_define_ioctl(), the 'num_sizes' is the sum of the
    'req->mip_levels' array. This array can be assigned any value from
    the user space. As both the 'num_sizes' and the array is uint32_t,
    it is easy to make 'num_sizes' overflow. The later 'mip_levels' is
    used as the loop count. This can lead an oob write. Add the check of
    'req->mip_levels' to avoid this.

    Signed-off-by: Li Qiang <liqiang6-s@360.cn>
    Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
    @@ -708,8 +708,11 @@ int vmw_surface_define_ioctl(struct drm_
    128;

    num_sizes = 0;
    - for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i)
    + for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i) {
    + if (req->mip_levels[i] > DRM_VMW_MAX_MIP_LEVELS)
    + return -EINVAL;
    num_sizes += req->mip_levels[i];
    + }

    if (num_sizes > DRM_VMW_MAX_SURFACE_FACES * DRM_VMW_MAX_MIP_LEVELS ||
    num_sizes == 0)

    \
     
     \ /
      Last update: 2017-04-20 09:06    [W:2.675 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site