Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions builtin/logical/transit/path_keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,10 @@ func (b *backend) pathPolicyWrite(ctx context.Context, req *logical.Request, d *
if p == nil {
return nil, fmt.Errorf("error generating key: returned policy was nil")
}
if b.System().CachingDisabled() {
p.Unlock()
if !b.System().CachingDisabled() {
p.Lock(true)
}
defer p.Unlock()

resp, err := b.formatKeyPolicy(p, nil)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions changelog/28839.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
secrets/transit: Fix a race in which responses from the key update api could contain results from another subsequent update
```
Loading