On 12/21/18 2:41 PM, Daniel P. Berrangé wrote: > In previous commit: > > commit 7dea29e4af17fc1d27478de9f8ea38144deac54a > Author: Li Qiang <liq...@gmail.com> > Date: Fri Oct 19 03:50:36 2018 -0700 > > hw: ccid-card-emulated: cleanup resource when realize in error path > > The emulated_realize method was changed so that it jumps to a cleanup > label to de-initialize state upon error. This change failed to ensure > the success path exited the method before this point though. So the > mutexes are always destroyed even in normal operation. The result is > as crashtastic as expected: > > $ qemu-system-x86_64 -usb -device usb-ccid,id=ccid0 -device > ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 > qemu-system-x86_64: util/qemu-thread-posix.c:64: qemu_mutex_lock_impl: > Assertion `mutex->initialized' failed. > Aborted (core dumped) > > Reported-by: Michael Tokarev <m...@tls.msk.ru>
Fixes: 7dea29e4af1 Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> Tested-by: Philippe Mathieu-Daudé <phi...@redhat.com> > Signed-off-by: Daniel P. Berrangé <berra...@redhat.com> > --- > hw/usb/ccid-card-emulated.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c > index 25976ed84f..e0457d305b 100644 > --- a/hw/usb/ccid-card-emulated.c > +++ b/hw/usb/ccid-card-emulated.c > @@ -549,6 +549,8 @@ static void emulated_realize(CCIDCardState *base, Error > **errp) > qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", > handle_apdu_thread, > card, QEMU_THREAD_JOINABLE); > > + return; > + > out2: > clean_event_notifier(card); > out1: >
