diff -Nru cryptsetup-2.2.2/debian/changelog cryptsetup-2.2.2/debian/changelog
--- cryptsetup-2.2.2/debian/changelog	2022-01-18 17:36:47.000000000 +0000
+++ cryptsetup-2.2.2/debian/changelog	2024-02-20 06:34:56.000000000 +0000
@@ -1,3 +1,10 @@
+cryptsetup (2:2.2.2-3ubuntu2.5) focal; urgency=medium
+
+  * Refine proc mounts entries traversal (LP: #2054390)
+    - d/i/h/cryptroot: use awk to filter out relevant mount points initially
+
+ -- Chengen Du <chengen.du@canonical.com>  Tue, 20 Feb 2024 06:34:56 +0000
+
 cryptsetup (2:2.2.2-3ubuntu2.4) focal-security; urgency=medium
 
   * SECURITY UPDATE: decryption through LUKS2 reencryption crash recovery
diff -Nru cryptsetup-2.2.2/debian/initramfs/hooks/cryptroot cryptsetup-2.2.2/debian/initramfs/hooks/cryptroot
--- cryptsetup-2.2.2/debian/initramfs/hooks/cryptroot	2020-02-04 13:11:12.000000000 +0000
+++ cryptsetup-2.2.2/debian/initramfs/hooks/cryptroot	2024-02-20 06:34:51.000000000 +0000
@@ -65,8 +65,7 @@
         # treat lines starting with '#' as comments; /proc/mounts
         # doesn't seem to contain these but per procfs(5) the format of
         # that file is analogous to fstab(5)'s
-        if [ "${spec#\#}" = "$spec" ] && [ -n "$spec" ] &&
-                [ "$(printf '%b' "$mountpoint")" = "$wantmount" ]; then
+        if [ "${spec#\#}" = "$spec" ] && [ -n "$spec" ]; then
             # take the last mountpoint if used several times (shadowed)
             unset -v devnos
             spec="$(printf '%b' "$spec")"
@@ -85,7 +84,9 @@
                 devnos="$MAJ:$MIN"
             fi
         fi
-    done </proc/mounts
+    done <<EOF
+$(awk -v mp="$wantmount" '$2 == mp' /proc/mounts | tail -n 1)
+EOF
 
     if [ -z "${devnos:+x}" ]; then
         return 1 # not found