From 78ff85852a8e6c23c96faa7b09817bc1822b8f56 Mon Sep 17 00:00:00 2001 From: Austin Gebauer Date: Sun, 24 Oct 2021 22:55:17 -0700 Subject: [PATCH 1/2] Adds missing unlock of RWMutex in OIDC delete key --- vault/identity_store_oidc.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vault/identity_store_oidc.go b/vault/identity_store_oidc.go index 8a4201c7e9702..cc66e63194af7 100644 --- a/vault/identity_store_oidc.go +++ b/vault/identity_store_oidc.go @@ -703,6 +703,7 @@ func (i *IdentityStore) pathOIDCDeleteKey(ctx context.Context, req *logical.Requ roleNames, err := i.roleNamesReferencingTargetKeyName(ctx, req, targetKeyName) if err != nil { + i.oidcLock.Unlock() return nil, err } @@ -715,6 +716,7 @@ func (i *IdentityStore) pathOIDCDeleteKey(ctx context.Context, req *logical.Requ clientNames, err := i.clientNamesReferencingTargetKeyName(ctx, req, targetKeyName) if err != nil { + i.oidcLock.Unlock() return nil, err } From 5f409abad3bb3127c1d1fee1a09b5f9f91a198be Mon Sep 17 00:00:00 2001 From: Austin Gebauer Date: Sun, 24 Oct 2021 23:34:48 -0700 Subject: [PATCH 2/2] Adds changelog entry --- changelog/12916.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/12916.txt diff --git a/changelog/12916.txt b/changelog/12916.txt new file mode 100644 index 0000000000000..8d75b39230a6d --- /dev/null +++ b/changelog/12916.txt @@ -0,0 +1,3 @@ +```release-note:bug +identity/token: Adds missing call to unlock mutex in key deletion error handling +```