From 5bc8092397c8d13d8f4ac1a308f2f89e76cdd591 Mon Sep 17 00:00:00 2001 From: pedro martelletto Date: Wed, 8 Sep 2021 10:42:56 +0200 Subject: [PATCH] explicitly close FIDO2 devices FIDO2 device access is serialised by libfido2 using flock(). Therefore, make sure to close a FIDO2 device once we are done with it, or we risk opening it again at a later point and deadlocking. Fixes #20664. (cherry picked from commit b6aa89b0a399992c8ea762e6ec4f30cff90618f2) (cherry picked from commit d6e4920b10c3da1665cb44f4686893b865003d12) --- src/shared/libfido2-util.c | 2 ++ src/shared/libfido2-util.h | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/shared/libfido2-util.c b/src/shared/libfido2-util.c index 22b8aba07e..054ee0b918 100644 --- a/src/shared/libfido2-util.c +++ b/src/shared/libfido2-util.c @@ -57,6 +57,7 @@ bool (*sym_fido_dev_is_fido2)(const fido_dev_t *) = NULL; int (*sym_fido_dev_make_cred)(fido_dev_t *, fido_cred_t *, const char *) = NULL; fido_dev_t* (*sym_fido_dev_new)(void) = NULL; int (*sym_fido_dev_open)(fido_dev_t *, const char *) = NULL; +int (*sym_fido_dev_close)(fido_dev_t *) = NULL; const char* (*sym_fido_strerr)(int) = NULL; int dlopen_libfido2(void) { @@ -116,6 +117,7 @@ int dlopen_libfido2(void) { DLSYM_ARG(fido_dev_make_cred), DLSYM_ARG(fido_dev_new), DLSYM_ARG(fido_dev_open), + DLSYM_ARG(fido_dev_close), DLSYM_ARG(fido_strerr), NULL); if (r < 0) diff --git a/src/shared/libfido2-util.h b/src/shared/libfido2-util.h index 3648ea44c7..97d70f0c23 100644 --- a/src/shared/libfido2-util.h +++ b/src/shared/libfido2-util.h @@ -48,6 +48,7 @@ extern bool (*sym_fido_dev_is_fido2)(const fido_dev_t *); extern int (*sym_fido_dev_make_cred)(fido_dev_t *, fido_cred_t *, const char *); extern fido_dev_t* (*sym_fido_dev_new)(void); extern int (*sym_fido_dev_open)(fido_dev_t *, const char *); +extern int (*sym_fido_dev_close)(fido_dev_t *); extern const char* (*sym_fido_strerr)(int); int dlopen_libfido2(void); @@ -63,8 +64,10 @@ static inline void fido_assert_free_wrapper(fido_assert_t **p) { } static inline void fido_dev_free_wrapper(fido_dev_t **p) { - if (*p) + if (*p) { + sym_fido_dev_close(*p); sym_fido_dev_free(p); + } } static inline void fido_cred_free_wrapper(fido_cred_t **p) { -- 2.25.1