1From e18a00073890021362b4a48097672f1d4b340d3c Mon Sep 17 00:00:00 2001
2From: Daniel Axtens <dja@axtens.net>
3Date: Fri, 22 Jan 2021 14:42:21 +1100
4Subject: [PATCH] disk/lvm: Do not allow a LV to be it's own segment's node's
5 LV
6
7This prevents infinite recursion in the diskfilter verification code.
8
9Signed-off-by: Daniel Axtens <dja@axtens.net>
10Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
11Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
12---
13 grub-core/disk/lvm.c | 10 +++++++---
14 1 file changed, 7 insertions(+), 3 deletions(-)
15
16diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
17index ed0712f..81dc375 100644
18--- a/grub-core/disk/lvm.c
19+++ b/grub-core/disk/lvm.c
20@@ -838,9 +838,13 @@ grub_lvm_detect (grub_disk_t disk,
21 		    }
22 		if (lv1->segments[i].nodes[j].pv == NULL)
23 		  for (lv2 = vg->lvs; lv2; lv2 = lv2->next)
24-		    if (grub_strcmp (lv2->name,
25-				     lv1->segments[i].nodes[j].name) == 0)
26-		      lv1->segments[i].nodes[j].lv = lv2;
27+		    {
28+		      if (lv1 == lv2)
29+		        continue;
30+		      if (grub_strcmp (lv2->name,
31+				       lv1->segments[i].nodes[j].name) == 0)
32+			lv1->segments[i].nodes[j].lv = lv2;
33+		    }
34 	      }
35
36       }
37--
382.14.2
39
40