diff options
| author | Matthias Bolte <matthias@tinkerforge.com> | 2021-09-22 13:40:23 +0200 |
|---|---|---|
| committer | Nathan Hjelm <hjelmn@me.com> | 2021-11-23 23:02:43 -0700 |
| commit | d4452bd5554b2e6cc7017ad9cdba54a848cf5e93 (patch) | |
| tree | 7439a111799e5cea50310f4c7d208087464a07ec | |
| parent | 683e3cf21ed37d4492c20cea8de810c4d95ae8b6 (diff) | |
| download | libusb-d4452bd5554b2e6cc7017ad9cdba54a848cf5e93.tar.gz | |
core: Unlock and clear default ctx in all error paths in libusb_init
Commit 32a22069428cda9d63aa666e92fb8882a83d4515 reordered and
refactored libusb_init. This resulted in moving code outside the
default ctx lock that was unrelated to it. But this resulted in
broken error path cleanup logic that leaves the default ctx as
locked, half initialized and freed in case a libusb_set_option or
the usbi_io_init call fails.
Undo part of the previous reordering to unlock and clear the default
ctx in all error paths in libusb_init.
Closes #995
Signed-off-by: Nathan Hjelm <hjelmn@google.com>
| -rw-r--r-- | libusb/core.c | 17 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/libusb/core.c b/libusb/core.c index 7976e4c..8ebf08b 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -2340,10 +2340,8 @@ int API_EXPORTED libusb_init(libusb_context **ctx) libusb_version_internal.micro, libusb_version_internal.nano, libusb_version_internal.rc); r = usbi_io_init(_ctx); - if (r < 0) { - usbi_mutex_static_unlock(&default_context_lock); + if (r < 0) goto err_free_ctx; - } usbi_mutex_static_lock(&active_contexts_lock); list_add(&_ctx->list, &active_contexts_list); @@ -2369,22 +2367,23 @@ err_io_exit: list_del(&_ctx->list); usbi_mutex_static_unlock(&active_contexts_lock); + usbi_hotplug_exit(_ctx); + usbi_io_exit(_ctx); + +err_free_ctx: if (!ctx) { + /* clear default context that was not fully initialized */ usbi_default_context = NULL; default_context_refcnt = 0; } - usbi_mutex_static_unlock(&default_context_lock); - - usbi_hotplug_exit(_ctx); - usbi_io_exit(_ctx); - -err_free_ctx: usbi_mutex_destroy(&_ctx->open_devs_lock); usbi_mutex_destroy(&_ctx->usb_devs_lock); free(_ctx); + usbi_mutex_static_unlock(&default_context_lock); + return r; } diff --git a/libusb/version_nano.h b/libusb/version_nano.h index ee61cdd..d5d1fd2 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11675 +#define LIBUSB_NANO 11676 |