diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-10-18 02:09:45 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-10-18 05:41:31 -0400 |
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, | |||
953 | uint32_t *tv_usec, | 953 | uint32_t *tv_usec, |
954 | bool interruptible) | 954 | bool interruptible) |
955 | { | 955 | { |
956 | struct vmw_event_fence_action *eaction = | 956 | struct vmw_event_fence_action *eaction; |
957 | kzalloc(sizeof(*eaction), GFP_KERNEL); | ||
958 | struct ttm_mem_global *mem_glob = | 957 | struct ttm_mem_global *mem_glob = |
959 | vmw_mem_glob(fence->fman->dev_priv); | 958 | vmw_mem_glob(fence->fman->dev_priv); |
960 | struct vmw_fence_manager *fman = fence->fman; | 959 | 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, | |||
1255 | struct drm_file *file_priv) | 1255 | struct drm_file *file_priv) |
1256 | { | 1256 | { |
1257 | struct vmw_private *dev_priv = vmw_priv(dev); | 1257 | struct vmw_private *dev_priv = vmw_priv(dev); |
1258 | struct vmw_user_surface *user_srf = | 1258 | struct vmw_user_surface *user_srf; |
1259 | kmalloc(sizeof(*user_srf), GFP_KERNEL); | ||
1260 | struct vmw_surface *srf; | 1259 | struct vmw_surface *srf; |
1261 | struct vmw_resource *res; | 1260 | struct vmw_resource *res; |
1262 | struct vmw_resource *tmp; | 1261 | struct vmw_resource *tmp; |