diff --git a/.pick_status.json b/.pick_status.json
index 9eb866955ca..dd7377c0b4c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2064,7 +2064,7 @@
         "description": "lavapipe: fix a leak on a lvp_image_create exit path",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/frontends/lavapipe/lvp_image.c b/src/gallium/frontends/lavapipe/lvp_image.c
index 5cf6aff111f..0878410ca7b 100644
--- a/src/gallium/frontends/lavapipe/lvp_image.c
+++ b/src/gallium/frontends/lavapipe/lvp_image.c
@@ -184,8 +184,10 @@ lvp_image_create(VkDevice _device,
                                                                &template,
                                                                &image->planes[p].size);
       }
-      if (!image->planes[p].bo)
-         return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
+      if (!image->planes[p].bo) {
+         result = vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
+         goto fail;
+      }
 
       image->planes[p].size = align64(image->planes[p].size, image->alignment);