github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-05-30 02:45:20 +00:00
Code Issues Projects Releases Wiki Activity

dm: uart: fix acrn-dm crash issue

Browse Source 
This patch resolves acrn-dm crash issue when acrnd boots up the acrn-dm.
The rootcause is mevent_enable and mevent_disable have NULL pointer as
its parameter if uart backend is not tty capable, so add check code for
the uart backend before invoking mevent_enable and mevent_disable.

The issue can be reproduced when acrnd boots up the acrn-dm.

Tracked-On: #1466
Signed-off-by: Yuan Liu <yuan1.liu@intel.com>
Reviewed-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Yuan Liu 2018-10-15 14:56:07 +08:00 committed by wenlingz
parent e7b63aec9d
commit dc05ffffaa
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devicemodel/hw/uart_core.c
View File

@ -188,8 +188,10 @@ rxfifo_reset(struct uart_vdev *uart, int size)
* Enable mevent to trigger when new characters are available
* on the tty fd.
*/
error = mevent_enable(uart->mev);
assert(error == 0);
if (isatty(uart->tty.fd)) {
error = mevent_enable(uart->mev);
assert(error == 0);
}
}
}
@ -219,8 +221,10 @@ rxfifo_putchar(struct uart_vdev *uart, uint8_t ch)
/*
* Disable mevent callback if the FIFO is full.
*/
error = mevent_disable(uart->mev);
assert(error == 0);
if (isatty(uart->tty.fd)) {
error = mevent_disable(uart->mev);
assert(error == 0);
}
}
}
return 0;
@ -243,7 +247,7 @@ rxfifo_getchar(struct uart_vdev *uart)
fifo->rindex = (fifo->rindex + 1) % fifo->size;
fifo->num--;
if (wasfull) {
if (uart->tty.opened) {
if (uart->tty.opened && isatty(uart->tty.fd)) {
error = mevent_enable(uart->mev);
assert(error == 0);
}