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