]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drm: fix leak of cliprects in drm_rmdraw()
authorZhenyu Wang <zhenyu.z.wang@intel.com>
Fri, 17 Oct 2008 07:48:44 +0000 (15:48 +0800)
committerDave Airlie <airlied@redhat.com>
Thu, 23 Oct 2008 03:42:26 +0000 (13:42 +1000)
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_drawable.c

index 70b15d1b8f545e3ebe0e3c9eb2f54c88b6a8f75f..4a794d89942bc34261eeeee1bd8d5e5b29ebf5a3 100644 (file)
@@ -76,11 +76,14 @@ int drm_rmdraw(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
        struct drm_draw *draw = data;
        unsigned long irqflags;
+       struct drm_drawable_info *info;
 
        spin_lock_irqsave(&dev->drw_lock, irqflags);
 
-       drm_free(drm_get_drawable_info(dev, draw->handle),
-                sizeof(struct drm_drawable_info), DRM_MEM_BUFS);
+       info = drm_get_drawable_info(dev, draw->handle);
+       drm_free(info->rects, info->num_rects * sizeof(struct drm_clip_rect),
+                       DRM_MEM_BUFS);
+       drm_free(info, sizeof(struct drm_drawable_info), DRM_MEM_BUFS);
 
        idr_remove(&dev->drw_idr, draw->handle);