diff --git a/src/boot/efi/disk.c b/src/boot/efi/disk.c
index fcd5812ff1..bf2984ed1f 100644
--- a/src/boot/efi/disk.c
+++ b/src/boot/efi/disk.c
@@ -8,31 +8,32 @@
 
 EFI_STATUS disk_get_part_uuid(EFI_HANDLE *handle, CHAR16 uuid[static 37]) {
         EFI_STATUS err;
-        EFI_DEVICE_PATH *device_path;
-        _cleanup_freepool_ EFI_DEVICE_PATH *paths = NULL;
+        EFI_DEVICE_PATH *dp;
 
         /* export the device path this image is started from */
 
         if (!handle)
                 return EFI_NOT_FOUND;
 
-        err = BS->HandleProtocol(handle, &DevicePathProtocol, (void **) &device_path);
+        err = BS->HandleProtocol(handle, &DevicePathProtocol, (void **) &dp);
         if (err != EFI_SUCCESS)
                 return err;
 
-        paths = UnpackDevicePath(device_path);
-        for (EFI_DEVICE_PATH *path = paths; !IsDevicePathEnd(path); path = NextDevicePathNode(path)) {
-                HARDDRIVE_DEVICE_PATH *drive;
-
-                if (DevicePathType(path) != MEDIA_DEVICE_PATH)
+        for (; !IsDevicePathEnd(dp); dp = NextDevicePathNode(dp)) {
+                if (DevicePathType(dp) != MEDIA_DEVICE_PATH)
                         continue;
-                if (DevicePathSubType(path) != MEDIA_HARDDRIVE_DP)
-                        continue;
-                drive = (HARDDRIVE_DEVICE_PATH *)path;
-                if (drive->SignatureType != SIGNATURE_TYPE_GUID)
+                if (DevicePathSubType(dp) != MEDIA_HARDDRIVE_DP)
                         continue;
 
-                GuidToString(uuid, (EFI_GUID *)&drive->Signature);
+                HARDDRIVE_DEVICE_PATH *hd = (HARDDRIVE_DEVICE_PATH *) dp;
+                if (hd->SignatureType != SIGNATURE_TYPE_GUID)
+                        continue;
+
+                /* Use memcpy in case the device path node is misaligned. */
+                EFI_GUID sig;
+                memcpy(&sig, hd->Signature, sizeof(hd->Signature));
+
+                GuidToString(uuid, &sig);
                 return EFI_SUCCESS;
         }