util: prevent a panic when creating an fscrypt protector failed

Signed-off-by: Niels de Vos <[email protected]>
ceph · Jan 29, 2025 · 003e0b3 · 003e0b3
1 parent 72cfaaf
commit 003e0b3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/internal/util/fscrypt/fscrypt.go b/internal/util/fscrypt/fscrypt.go
@@ -217,12 +217,14 @@ func initializeAndUnlock(
 	}
 
 	protector, err := fscryptactions.CreateProtector(fscryptContext, protectorName, keyFn, owner)
-	if err != nil {
+	if err != nil && protector != nil {
 		log.ErrorLog(ctx, "fscrypt: protector name=%s create failed: %v. reverting.", protectorName, err)
 		if revertErr := protector.Revert(); revertErr != nil {
 			return revertErr
 		}
 
+		return err
+	} else if err != nil {
 		return err
 	}