From 00eaf0727f32ff3b59c42f14f9db616d3d49c3eb Mon Sep 17 00:00:00 2001
From: Matt Schultz <975680+schultz-is@users.noreply.github.com>
Date: Tue, 6 Sep 2022 13:03:24 -0500
Subject: [PATCH] Account for a possible error in Transit BYOK. (#17025)

---
 builtin/logical/transit/path_import.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/builtin/logical/transit/path_import.go b/builtin/logical/transit/path_import.go
index 47997e0aad..817cf5fc5d 100644
--- a/builtin/logical/transit/path_import.go
+++ b/builtin/logical/transit/path_import.go
@@ -258,6 +258,9 @@ func (b *backend) pathImportVersionWrite(ctx context.Context, req *logical.Reque
 		return nil, err
 	}
 	importKey, err := b.decryptImportedKey(ctx, req.Storage, ciphertext, hashFn)
+	if err != nil {
+		return nil, err
+	}
 	err = p.Import(ctx, req.Storage, importKey, b.GetRandomReader())
 	if err != nil {
 		return nil, err