Adds missing unlock of RWMutex in OIDC delete key (hashicorp#12916)

qk4l · Feb 4, 2022 · 9611adf · 9611adf
1 parent 98236e9
commit 9611adf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/changelog/12916.txt b/changelog/12916.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+identity/token: Adds missing call to unlock mutex in key deletion error handling
+```
diff --git 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
 	}