diff options
author | Vladis Dronov <vdronov@redhat.com> | 2017-06-02 07:42:09 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2017-07-02 17:13:03 +0100 |
commit | 7943d19453aa1a1acf93bdb2812e0bef970ec23c (patch) | |
tree | 945ec6f3d8d9d450d7fbd01c1a766ce93e8eac14 | |
parent | 702f4dd27ccf3bae7915ef1f8790db3af435d211 (diff) |
drm/vmwgfx: limit the number of mip levels in vmw_gb_surface_define_ioctl()
commit ee9c4e681ec4f58e42a83cb0c22a0289ade1aacf upstream.
The 'req->mip_levels' parameter in vmw_gb_surface_define_ioctl() is
a user-controlled 'uint32_t' value which is used as a loop count limit.
This can lead to a kernel lockup and DoS. Add check for 'req->mip_levels'.
References:
https://bugzilla.redhat.com/show_bug.cgi?id=1437431
Signed-off-by: Vladis Dronov <vdronov@redhat.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c index 67623797bd55..14551e27814c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c @@ -1251,6 +1251,9 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data, const struct svga3d_surface_desc *desc; uint32_t backup_handle; + if (req->mip_levels > DRM_VMW_MAX_MIP_LEVELS) + return -EINVAL; + if (unlikely(vmw_user_surface_size == 0)) vmw_user_surface_size = ttm_round_pot(sizeof(*user_srf)) + 128; |