github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-24 14:33:38 +00:00
Code Issues Projects Releases Wiki Activity

ACRN:DM: Fix the Null pointer error

Browse Source 
Function virtio_console_close_all will close all consoles, if the console->nports
value is 1, after the console be destroyed by the mevent teardown function, when
get the nports from the console, there will cause the NULL pointer. Fix the issue.

Tracked-On: #6431
Signed-off-by: Liu Long long.liu@intel.com
Reviewed-by: Jian Jun Chen jian.jun.chen@intel.com
Acked-by: Wang, Yu1 yu1.wang@intel.com
This commit is contained in:
Liu Long 2021-08-19 09:01:59 +08:00 committed by wenlingz
parent a73dd7b5f7
commit 4d8623ffc0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devicemodel/hw/pci/virtio/virtio_console.c
View File

@ -1043,7 +1043,7 @@ virtio_console_teardown_backend(void *param)
static int static int
virtio_console_close_all(struct virtio_console *console) virtio_console_close_all(struct virtio_console *console)
{ {
int i, rc = 0; int i, rc = 0, nports_num;
struct virtio_console_port *port; struct virtio_console_port *port;
struct virtio_console_backend *be; struct virtio_console_backend *be;
@ -1061,8 +1061,16 @@ virtio_console_close_all(struct virtio_console *console)
if (be && !be->evp) if (be && !be->evp)
virtio_console_close_backend(be); virtio_console_close_backend(be);
} }
/*
* The mevent_delete function will call teardown to delete
* the console if the console->nports = 1, after the console
* be destroyed there will be a NULL pointer issue.
* Why don't check the console ? because the console delete
* is not at the same thread.
* */
for (i = 0; i < console->nports; i++) { nports_num = console->nports;
for (i = 0; i < nports_num; i++) {
port = &console->ports[i]; port = &console->ports[i];
if (!port->enabled) if (!port->enabled)