Commit 20996e6d authored by Murray McAllister's avatar Murray McAllister Committed by Ben Hutchings

drm/vmwgfx: NULL pointer dereference in vmw_surface_define_ioctl()

commit 36274ab8 upstream.

Before memory allocations vmw_surface_define_ioctl() checks the
upper-bounds of a user-supplied size, but does not check if the
supplied size is 0.

Add check to avoid NULL pointer dereferences.
Signed-off-by: default avatarMurray McAllister <murray.mcallister@insomniasec.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 4d09fd35
...@@ -1307,8 +1307,8 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, ...@@ -1307,8 +1307,8 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data,
for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i) for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i)
num_sizes += req->mip_levels[i]; num_sizes += req->mip_levels[i];
if (num_sizes > DRM_VMW_MAX_SURFACE_FACES * if (num_sizes > DRM_VMW_MAX_SURFACE_FACES * DRM_VMW_MAX_MIP_LEVELS ||
DRM_VMW_MAX_MIP_LEVELS) num_sizes == 0)
return -EINVAL; return -EINVAL;
size = vmw_user_surface_size + 128 + size = vmw_user_surface_size + 128 +
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment