Commit 2fe76055 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

virtio-gpu: check max_outputs only 



The scanout id should not be above the configured num_scanouts.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 1463653560-26958-5-git-send-email-marcandre.lureau@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 5e3d741c

hw/display/virtio-gpu-3d.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static void virgl_cmd_resource_flush(VirtIOGPU *g, 
    trace_virtio_gpu_cmd_res_flush(rf.resource_id,

                                   rf.r.width, rf.r.height, rf.r.x, rf.r.y);



    for (i = 0; i < VIRTIO_GPU_MAX_SCANOUT; i++) {

    for (i = 0; i < g->conf.max_outputs; i++) {

        if (g->scanout[i].resource_id != rf.resource_id) {

            continue;

        }
@@ -147,7 +147,7 @@ static void virgl_cmd_set_scanout(VirtIOGPU *g, 
    trace_virtio_gpu_cmd_set_scanout(ss.scanout_id, ss.resource_id,

                                     ss.r.width, ss.r.height, ss.r.x, ss.r.y);



    if (ss.scanout_id >= VIRTIO_GPU_MAX_SCANOUT) {

    if (ss.scanout_id >= g->conf.max_outputs) {

        qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout id specified %d",

                      __func__, ss.scanout_id);

        cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID;

hw/display/virtio-gpu.c

+2 −3
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static void virtio_gpu_resource_flush(VirtIOGPU *g, 


    pixman_region_init_rect(&flush_region,

                            rf.r.x, rf.r.y, rf.r.width, rf.r.height);

    for (i = 0; i < VIRTIO_GPU_MAX_SCANOUT; i++) {

    for (i = 0; i < g->conf.max_outputs; i++) {

        struct virtio_gpu_scanout *scanout;

        pixman_region16_t region, finalregion;

        pixman_box16_t *extents;
@@ -509,8 +509,7 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g, 
    trace_virtio_gpu_cmd_set_scanout(ss.scanout_id, ss.resource_id,

                                     ss.r.width, ss.r.height, ss.r.x, ss.r.y);



    if (ss.scanout_id >= VIRTIO_GPU_MAX_SCANOUT ||

        ss.scanout_id >= g->conf.max_outputs) {

    if (ss.scanout_id >= g->conf.max_outputs) {

        qemu_log_mask(LOG_GUEST_ERROR, "%s: illegal scanout id specified %d",

                      __func__, ss.scanout_id);

        cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID;