disk/lvm: Do not allow a LV to be it's own segment's node's LV

This prevents infinite recursion in the diskfilter verification code.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
index 4e17b8897390a9e045c32cc4b37b8ecf6298a6ff..8257159b344593c480897f3db72e1a5c8d4a9277 100644 (file)
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -981,9 +981,13 @@ grub_lvm_detect (grub_disk_t disk,
                    }
                if (lv1->segments[i].nodes[j].pv == NULL)
                  for (lv2 = vg->lvs; lv2; lv2 = lv2->next)
-                   if (grub_strcmp (lv2->name,
-                                    lv1->segments[i].nodes[j].name) == 0)
-                     lv1->segments[i].nodes[j].lv = lv2;
+                   {
+                     if (lv1 == lv2)
+                       continue;
+                     if (grub_strcmp (lv2->name,
+                                      lv1->segments[i].nodes[j].name) == 0)
+                       lv1->segments[i].nodes[j].lv = lv2;
+                   }
              }
        
       }