From 331201f9af586d9744f48966f4f4008dd31dd7f9 Mon Sep 17 00:00:00 2001 From: Brian Kassouf Date: Tue, 9 Apr 2019 17:19:03 -0700 Subject: [PATCH 1/2] Fix deadlock on the mountsLock --- vault/logical_system.go | 1 + 1 file changed, 1 insertion(+) diff --git a/vault/logical_system.go b/vault/logical_system.go index 842b5f4cde0e..d87d3c2a316a 100644 --- a/vault/logical_system.go +++ b/vault/logical_system.go @@ -2913,6 +2913,7 @@ func (b *SystemBackend) pathInternalUIMountsRead(ctx context.Context, req *logic for _, entry := range b.Core.mounts.Entries { filtered, err := b.Core.checkReplicatedFiltering(ctx, entry, "") if err != nil { + b.Core.mountsLock.RUnlock() return nil, err } if filtered { From ec2061d53cb57affb5b9446ca3e8d754cdc33294 Mon Sep 17 00:00:00 2001 From: Brian Kassouf Date: Tue, 9 Apr 2019 17:21:35 -0700 Subject: [PATCH 2/2] Fix deadlock on authLock too --- vault/logical_system.go | 1 + 1 file changed, 1 insertion(+) diff --git a/vault/logical_system.go b/vault/logical_system.go index d87d3c2a316a..0659372aacc6 100644 --- a/vault/logical_system.go +++ b/vault/logical_system.go @@ -2939,6 +2939,7 @@ func (b *SystemBackend) pathInternalUIMountsRead(ctx context.Context, req *logic for _, entry := range b.Core.auth.Entries { filtered, err := b.Core.checkReplicatedFiltering(ctx, entry, credentialRoutePrefix) if err != nil { + b.Core.authLock.RUnlock() return nil, err } if filtered {