haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hw: ccid-card-emulated: cleanup resource when realize in error path

Browse source 
Signed-off-by: Li Qiang <liq3ea@gmail.com>
Message-id: 1539946236-18028-3-git-send-email-liq3ea@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Li Qiang 2018-10-19 03:50:36 -07:00 committed by Gerd Hoffmann
parent ca1d410285
commit 7dea29e4af
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
hw/usb/ccid-card-emulated.c
View file

@ -499,7 +499,7 @@ static void emulated_realize(CCIDCardState *base, Error **errp)
card->reader = NULL; card->reader = NULL;
card->quit_apdu_thread = 0; card->quit_apdu_thread = 0;
if (init_event_notifier(card, errp) < 0) { if (init_event_notifier(card, errp) < 0) {
return; goto out1;
} }
card->backend = 0; card->backend = 0;
@ -513,7 +513,7 @@ static void emulated_realize(CCIDCardState *base, Error **errp)
for (ptable = backend_enum_table; ptable->name != NULL; ++ptable) { for (ptable = backend_enum_table; ptable->name != NULL; ++ptable) {
error_append_hint(errp, "%s\n", ptable->name); error_append_hint(errp, "%s\n", ptable->name);
} }
return; goto out2;
} }
/* TODO: a passthru backened that works on local machine. third card type?*/ /* TODO: a passthru backened that works on local machine. third card type?*/
@ -523,31 +523,39 @@ static void emulated_realize(CCIDCardState *base, Error **errp)
} else { } else {
error_setg(errp, "%s: you must provide all three certs for" error_setg(errp, "%s: you must provide all three certs for"
" certificates backend", TYPE_EMULATED_CCID); " certificates backend", TYPE_EMULATED_CCID);
return; goto out2;
} }
} else { } else {
if (card->backend != BACKEND_NSS_EMULATED) { if (card->backend != BACKEND_NSS_EMULATED) {
error_setg(errp, "%s: bad backend specified. The options are:%s" error_setg(errp, "%s: bad backend specified. The options are:%s"
" (default), %s.", TYPE_EMULATED_CCID, " (default), %s.", TYPE_EMULATED_CCID,
BACKEND_NSS_EMULATED_NAME, BACKEND_CERTIFICATES_NAME); BACKEND_NSS_EMULATED_NAME, BACKEND_CERTIFICATES_NAME);
return; goto out2;
} }
if (card->cert1 != NULL || card->cert2 != NULL || card->cert3 != NULL) { if (card->cert1 != NULL || card->cert2 != NULL || card->cert3 != NULL) {
error_setg(errp, "%s: unexpected cert parameters to nss emulated " error_setg(errp, "%s: unexpected cert parameters to nss emulated "
"backend", TYPE_EMULATED_CCID); "backend", TYPE_EMULATED_CCID);
return; goto out2;
} }
/* default to mirroring the local hardware readers */ /* default to mirroring the local hardware readers */
ret = wrap_vcard_emul_init(NULL); ret = wrap_vcard_emul_init(NULL);
} }
if (ret != VCARD_EMUL_OK) { if (ret != VCARD_EMUL_OK) {
error_setg(errp, "%s: failed to initialize vcard", TYPE_EMULATED_CCID); error_setg(errp, "%s: failed to initialize vcard", TYPE_EMULATED_CCID);
return; goto out2;
} }
qemu_thread_create(&card->event_thread_id, "ccid/event", event_thread, qemu_thread_create(&card->event_thread_id, "ccid/event", event_thread,
card, QEMU_THREAD_JOINABLE); card, QEMU_THREAD_JOINABLE);
qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", handle_apdu_thread, qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", handle_apdu_thread,
card, QEMU_THREAD_JOINABLE); card, QEMU_THREAD_JOINABLE);
out2:
clean_event_notifier(card);
out1:
qemu_cond_destroy(&card->handle_apdu_cond);
qemu_mutex_destroy(&card->handle_apdu_mutex);
qemu_mutex_destroy(&card->vreader_mutex);
qemu_mutex_destroy(&card->event_list_mutex);
} }
static void emulated_unrealize(CCIDCardState *base, Error **errp) static void emulated_unrealize(CCIDCardState *base, Error **errp)