diff --git a/.pick_status.json b/.pick_status.json
index 06d90e563b6..2d914d119db 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1048,7 +1048,7 @@
         "description": "lavapipe: clamp cache uuid size",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c
index e88e2b17a3f..0ec08b50c7f 100644
--- a/src/gallium/frontends/lavapipe/lvp_device.c
+++ b/src/gallium/frontends/lavapipe/lvp_device.c
@@ -1079,10 +1079,10 @@ lvp_device_get_cache_uuid(void *uuid)
    memset(uuid, 'a', VK_UUID_SIZE);
    if (MESA_GIT_SHA1[0])
       /* debug build */
-      memcpy(uuid, &MESA_GIT_SHA1[4], strlen(MESA_GIT_SHA1) - 4);
+      memcpy(uuid, &MESA_GIT_SHA1[4], MIN2(strlen(MESA_GIT_SHA1) - 4, VK_UUID_SIZE));
    else
       /* release build */
-      memcpy(uuid, PACKAGE_VERSION, strlen(PACKAGE_VERSION));
+      memcpy(uuid, PACKAGE_VERSION, MIN2(strlen(PACKAGE_VERSION), VK_UUID_SIZE));
 }
 
 VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice,