30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From: Murray McAllister <murray.mcallister@insomniasec.com>
|
|
Date: Fri, 24 Mar 2017 20:33:00 -0700
|
|
Subject: vmwgfx: NULL pointer dereference in vmw_surface_define_ioctl()
|
|
Origin: https://cgit.freedesktop.org/mesa/vmwgfx/commit/?id=e904061d2c8968429954be87ad1cc45526510812
|
|
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-7261
|
|
|
|
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: Murray McAllister <murray.mcallister@insomniasec.com>
|
|
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
|
|
[bwh: Fix filename]
|
|
---
|
|
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
|
|
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
|
|
@@ -716,8 +716,8 @@ int vmw_surface_define_ioctl(struct drm_
|
|
for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i)
|
|
num_sizes += req->mip_levels[i];
|
|
|
|
- if (num_sizes > DRM_VMW_MAX_SURFACE_FACES *
|
|
- DRM_VMW_MAX_MIP_LEVELS)
|
|
+ if (num_sizes > DRM_VMW_MAX_SURFACE_FACES * DRM_VMW_MAX_MIP_LEVELS ||
|
|
+ num_sizes == 0)
|
|
return -EINVAL;
|
|
|
|
size = vmw_user_surface_size + 128 +
|