[PATCH] fix detection of non-LUKS CRYPT

[Corey Hickey]

Recent grub no longer detects non-LUKS ("plain dm-crypt") devices
properly. I think I tracked it down; the following patch fixes the
problem for me.


commit 4eb670dc50fe84012ec3e1f226ef9e94d8fa4b2b
Author: Corey Hickey <address@hidden>
Date:   Sun Oct 30 22:35:32 2016 -0700

    devmapper: fix detection of non-LUKS CRYPT
    
    grub_util_get_dm_abstraction() does a string comparison of insufficient
    length. When using a UUID such as "CRYPT-PLAIN-sda6_crypt", the function
    returns GRUB_DEV_ABSTRACTION_LUKS.
    
    This results in the error:
        ./grub-probe: error: disk `cryptouuid/sda6_crypt' not found.
    
    This appears to be a copy/paste error introduced in:
    a10e7a5a8918bea6e2632055129fa9b516fe965a
    
    The bug was (apparently) latent until revealed by:
    3bca85b4184f74995a7cc2791e432173fde26d34
    
    Signed-off-by: Corey Hickey <address@hidden>

diff --git a/grub-core/osdep/devmapper/getroot.c 
b/grub-core/osdep/devmapper/getroot.c
index 72e5582..a13a39c 100644
--- a/grub-core/osdep/devmapper/getroot.c
+++ b/grub-core/osdep/devmapper/getroot.c
@@ -143,7 +143,7 @@ grub_util_get_dm_abstraction (const char *os_dev)
       grub_free (uuid);
       return GRUB_DEV_ABSTRACTION_LVM;
     }
-  if (strncmp (uuid, "CRYPT-LUKS1-", 4) == 0)
+  if (strncmp (uuid, "CRYPT-LUKS1-", 12) == 0)
     {
       grub_free (uuid);
       return GRUB_DEV_ABSTRACTION_LUKS;


Thanks,
Corey