diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-10-18 09:09:45 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-10-18 10:41:31 +0100 |
| commit | 0c5d37033b3a16fdf6442730cee82dd3e8465fb1 (patch) | |
| tree | 0eadc332097cb6dc987e93e7ce9a20f02cabfe0a | |
| parent | d2c184fb10656f2a6d59fef76efb3a8b12fb6ed4 (diff) | |
vmwgfx: memory leaks caused by double allocation
These variables get allocated twice so the first allocation is a
memory leak.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c index 35d5f61fc7e4..15fb26088d68 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c @@ -953,8 +953,7 @@ int vmw_event_fence_action_create(struct drm_file *file_priv, uint32_t *tv_usec, bool interruptible) { - struct vmw_event_fence_action *eaction = - kzalloc(sizeof(*eaction), GFP_KERNEL); + struct vmw_event_fence_action *eaction; struct ttm_mem_global *mem_glob = vmw_mem_glob(fence->fman->dev_priv); struct vmw_fence_manager *fman = fence->fman; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index c7cff3debe11..86c5e4cceb31 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -1255,8 +1255,7 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct vmw_private *dev_priv = vmw_priv(dev); - struct vmw_user_surface *user_srf = - kmalloc(sizeof(*user_srf), GFP_KERNEL); + struct vmw_user_surface *user_srf; struct vmw_surface *srf; struct vmw_resource *res; struct vmw_resource *tmp; |