OSDN Git Service

drm/qxl: Avoid double free on error
authorFrediano Ziglio <fziglio@redhat.com>
Wed, 3 Jun 2015 11:09:12 +0000 (12:09 +0100)
committerDave Airlie <airlied@redhat.com>
Fri, 5 Jun 2015 01:00:49 +0000 (11:00 +1000)
Is we are not able to get source bo object from handle we free
destination bo object and call cleanup code however destination
object was already inserted in reloc_info array (num_relocs was
already incremented) so on cleanup we free destination again.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/qxl/qxl_ioctl.c

index 9bf1368..77fcde6 100644 (file)
@@ -240,8 +240,6 @@ static int qxl_process_single_command(struct qxl_device *qdev,
                                qxlhw_handle_to_bo(qdev, file_priv,
                                                   reloc.src_handle, release);
                        if (!reloc_info[i].src_bo) {
-                               if (reloc_info[i].dst_bo != cmd_bo)
-                                       drm_gem_object_unreference_unlocked(&reloc_info[i].dst_bo->gem_base);
                                ret = -EINVAL;
                                goto out_free_bos;
                        }