backport of commit 283ef77 (#17965)

Co-authored-by: Brian Kassouf <briankassouf@users.noreply.github.com>
hashicorp · Nov 16, 2022 · 4341446 · 4341446
1 parent 6b9c968
commit 4341446
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/changelog/17944.txt b/changelog/17944.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core: Fix potential deadlock if barrier ciphertext is less than 4 bytes.
+```
diff --git a/vault/barrier_aes_gcm.go b/vault/barrier_aes_gcm.go
@@ -1069,11 +1069,13 @@ func (b *AESGCMBarrier) Decrypt(_ context.Context, key string, ciphertext []byte
 	}
 
 	if len(ciphertext) == 0 {
+		b.l.RUnlock()
 		return nil, fmt.Errorf("empty ciphertext")
 	}
 
 	// Verify the term
 	if len(ciphertext) < 4 {
+		b.l.RUnlock()
 		return nil, fmt.Errorf("invalid ciphertext term")
 	}
 	term := binary.BigEndian.Uint32(ciphertext[:4])