From 8b7767e6437e16fd83ecaee17ecbb2c3422ea7b1 Mon Sep 17 00:00:00 2001
From: Zhao Yakui <yakui.zhao@intel.com>
Date: Thu, 21 Apr 2022 15:46:51 +0800
Subject: [PATCH] ACRN:DM:VGPU: Fix the incorrect use after free

It still tries to access the gpu->vdpy_handel after the gpu
is free. This is incorrect.

Tracked-On: #7337
Acked-by: Wang Yu <yu1.wang@intel.com>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
---
 devicemodel/hw/pci/virtio/virtio_gpu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/devicemodel/hw/pci/virtio/virtio_gpu.c b/devicemodel/hw/pci/virtio/virtio_gpu.c
index c315dc604..dedde9dd9 100644
--- a/devicemodel/hw/pci/virtio/virtio_gpu.c
+++ b/devicemodel/hw/pci/virtio/virtio_gpu.c
@@ -1680,12 +1680,13 @@ virtio_gpu_deinit(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
 		}
 	}
 
+	vdpy_deinit(gpu->vdpy_handle);
+
 	if (gpu) {
 		pthread_mutex_destroy(&gpu->mtx);
 		free(gpu);
 	}
 	virtio_gpu_device_cnt--;
-	vdpy_deinit(gpu->vdpy_handle);
 }
 
 uint64_t