Commit 26823129 authored by Sinclair Yeh's avatar Sinclair Yeh Committed by Ben Hutchings

drm/vmwgfx: Make sure backup_handle is always valid

commit 07678eca upstream.

When vmw_gb_surface_define_ioctl() is called with an existing buffer,
we end up returning an uninitialized variable in the backup_handle.

The fix is to first initialize backup_handle to 0 just to be sure, and
second, when a user-provided buffer is found, we will use the
req->buffer_handle as the backup_handle.
Reported-by: default avatarMurray McAllister <murray.mcallister@insomniasec.com>
Signed-off-by: default avatarSinclair Yeh <syeh@vmware.com>
Reviewed-by: default avatarDeepak Rawat <drawat@vmware.com>
[bwh: Backported to 3.16: There's no size check after vmw_user_dmabuf_lookup(),
 so only check ret == 0.]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 3cbd86d2
...@@ -1245,7 +1245,7 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data, ...@@ -1245,7 +1245,7 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,
int ret; int ret;
uint32_t size; uint32_t size;
const struct svga3d_surface_desc *desc; const struct svga3d_surface_desc *desc;
uint32_t backup_handle; uint32_t backup_handle = 0;
if (req->mip_levels > DRM_VMW_MAX_MIP_LEVELS) if (req->mip_levels > DRM_VMW_MAX_MIP_LEVELS)
return -EINVAL; return -EINVAL;
...@@ -1317,6 +1317,8 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data, ...@@ -1317,6 +1317,8 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev, void *data,
ret = vmw_user_dmabuf_lookup(tfile, req->buffer_handle, ret = vmw_user_dmabuf_lookup(tfile, req->buffer_handle,
&res->backup, &res->backup,
&user_srf->backup_base); &user_srf->backup_base);
if (ret == 0)
backup_handle = req->buffer_handle;
} else if (req->drm_surface_flags & } else if (req->drm_surface_flags &
drm_vmw_surface_flag_create_buffer) drm_vmw_surface_flag_create_buffer)
ret = vmw_user_dmabuf_alloc(dev_priv, tfile, ret = vmw_user_dmabuf_alloc(dev_priv, tfile,
......
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