mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chardev: fix segfault in finalize 

If finalize chardev-msmouse or chardev-wctable is called immediately after
init it cases QEMU to crash with segfault. This happens because of
QTAILQ_REMOVE in qemu_input_handler_unregister tries to dereference
NULL pointer.
For instance, this error can be reproduced via `qom-list-properties`
command.

Signed-off-by: Maksim Davydov <davydov-max@yandex-team.ru>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20220825165247.33704-1-davydov-max@yandex-team.ru>
This commit is contained in:
Maksim Davydov 2022-08-25 19:52:47 +03:00 committed by Marc-André Lureau
parent 769a726ccb
commit fc0c128531
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chardev/msmouse.c
View File

@ -247,7 +247,9 @@ static void char_msmouse_finalize(Object *obj)
{ {
MouseChardev *mouse = MOUSE_CHARDEV(obj); MouseChardev *mouse = MOUSE_CHARDEV(obj);
qemu_input_handler_unregister(mouse->hs); if (mouse->hs) {
qemu_input_handler_unregister(mouse->hs);
}
fifo8_destroy(&mouse->outbuf); fifo8_destroy(&mouse->outbuf);
} }

4
chardev/wctablet.c
View File

@ -319,7 +319,9 @@ static void wctablet_chr_finalize(Object *obj)
{ {
TabletChardev *tablet = WCTABLET_CHARDEV(obj); TabletChardev *tablet = WCTABLET_CHARDEV(obj);
qemu_input_handler_unregister(tablet->hs); if (tablet->hs) {
qemu_input_handler_unregister(tablet->hs);
}
} }
static void wctablet_chr_open(Chardev *chr, static void wctablet_chr_open(Chardev *chr,