0124-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch 1.2 KB

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