0063-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch 3.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129
  1. From 23e39f50ca7a107f6b66396ed4d177a914dee035 Mon Sep 17 00:00:00 2001
  2. From: Marco A Benatto <mbenatto@redhat.com>
  3. Date: Mon, 7 Dec 2020 11:53:03 -0300
  4. Subject: [PATCH] disk/ldm: Make sure comp data is freed before exiting from
  5. make_vg()
  6. Several error handling paths in make_vg() do not free comp data before
  7. jumping to fail2 label and returning from the function. This will leak
  8. memory. So, let's fix all issues of that kind.
  9. Fixes: CID 73804
  10. Signed-off-by: Marco A Benatto <mbenatto@redhat.com>
  11. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  12. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
  13. ---
  14. grub-core/disk/ldm.c | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
  15. 1 file changed, 44 insertions(+), 7 deletions(-)
  16. diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
  17. index 58f8a53..428415f 100644
  18. --- a/grub-core/disk/ldm.c
  19. +++ b/grub-core/disk/ldm.c
  20. @@ -554,7 +554,11 @@ make_vg (grub_disk_t disk,
  21. comp->segments = grub_calloc (comp->segment_alloc,
  22. sizeof (*comp->segments));
  23. if (!comp->segments)
  24. - goto fail2;
  25. + {
  26. + grub_free (comp->internal_id);
  27. + grub_free (comp);
  28. + goto fail2;
  29. + }
  30. }
  31. else
  32. {
  33. @@ -562,7 +566,11 @@ make_vg (grub_disk_t disk,
  34. comp->segment_count = 1;
  35. comp->segments = grub_malloc (sizeof (*comp->segments));
  36. if (!comp->segments)
  37. - goto fail2;
  38. + {
  39. + grub_free (comp->internal_id);
  40. + grub_free (comp);
  41. + goto fail2;
  42. + }
  43. comp->segments->start_extent = 0;
  44. comp->segments->extent_count = lv->size;
  45. comp->segments->layout = 0;
  46. @@ -574,15 +582,26 @@ make_vg (grub_disk_t disk,
  47. comp->segments->layout = GRUB_RAID_LAYOUT_SYMMETRIC_MASK;
  48. }
  49. else
  50. - goto fail2;
  51. + {
  52. + grub_free (comp->segments);
  53. + grub_free (comp->internal_id);
  54. + grub_free (comp);
  55. + goto fail2;
  56. + }
  57. ptr += *ptr + 1;
  58. ptr++;
  59. if (!(vblk[i].flags & 0x10))
  60. - goto fail2;
  61. + {
  62. + grub_free (comp->segments);
  63. + grub_free (comp->internal_id);
  64. + grub_free (comp);
  65. + goto fail2;
  66. + }
  67. if (ptr >= vblk[i].dynamic + sizeof (vblk[i].dynamic)
  68. || ptr + *ptr + 1 >= vblk[i].dynamic
  69. + sizeof (vblk[i].dynamic))
  70. {
  71. + grub_free (comp->segments);
  72. grub_free (comp->internal_id);
  73. grub_free (comp);
  74. goto fail2;
  75. @@ -592,6 +611,7 @@ make_vg (grub_disk_t disk,
  76. if (ptr + *ptr + 1 >= vblk[i].dynamic
  77. + sizeof (vblk[i].dynamic))
  78. {
  79. + grub_free (comp->segments);
  80. grub_free (comp->internal_id);
  81. grub_free (comp);
  82. goto fail2;
  83. @@ -601,7 +621,12 @@ make_vg (grub_disk_t disk,
  84. comp->segments->nodes = grub_calloc (comp->segments->node_alloc,
  85. sizeof (*comp->segments->nodes));
  86. if (!lv->segments->nodes)
  87. - goto fail2;
  88. + {
  89. + grub_free (comp->segments);
  90. + grub_free (comp->internal_id);
  91. + grub_free (comp);
  92. + goto fail2;
  93. + }
  94. }
  95. if (lv->segments->node_alloc == lv->segments->node_count)
  96. @@ -611,11 +636,23 @@ make_vg (grub_disk_t disk,
  97. if (grub_mul (lv->segments->node_alloc, 2, &lv->segments->node_alloc) ||
  98. grub_mul (lv->segments->node_alloc, sizeof (*lv->segments->nodes), &sz))
  99. - goto fail2;
  100. + {
  101. + grub_free (comp->segments->nodes);
  102. + grub_free (comp->segments);
  103. + grub_free (comp->internal_id);
  104. + grub_free (comp);
  105. + goto fail2;
  106. + }
  107. t = grub_realloc (lv->segments->nodes, sz);
  108. if (!t)
  109. - goto fail2;
  110. + {
  111. + grub_free (comp->segments->nodes);
  112. + grub_free (comp->segments);
  113. + grub_free (comp->internal_id);
  114. + grub_free (comp);
  115. + goto fail2;
  116. + }
  117. lv->segments->nodes = t;
  118. }
  119. lv->segments->nodes[lv->segments->node_count].pv = 0;
  120. --
  121. 2.14.2