0009-gfxmenu-Fix-double-free-in-load_image.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From 9ff609f0e7798bc5fb04f791131c98e7693bdd9b Mon Sep 17 00:00:00 2001
  2. From: Alexey Makhalov <amakhalov@vmware.com>
  3. Date: Wed, 8 Jul 2020 20:41:56 +0000
  4. Subject: [PATCH] gfxmenu: Fix double free in load_image()
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. self->bitmap should be zeroed after free. Otherwise, there is a chance
  9. to double free (USE_AFTER_FREE) it later in rescale_image().
  10. Fixes: CID 292472
  11. Signed-off-by: Alexey Makhalov <amakhalov@vmware.com>
  12. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  13. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
  14. ---
  15. grub-core/gfxmenu/gui_image.c | 5 ++++-
  16. 1 file changed, 4 insertions(+), 1 deletion(-)
  17. diff --git a/grub-core/gfxmenu/gui_image.c b/grub-core/gfxmenu/gui_image.c
  18. index 29784ed2d..6b2e976f1 100644
  19. --- a/grub-core/gfxmenu/gui_image.c
  20. +++ b/grub-core/gfxmenu/gui_image.c
  21. @@ -195,7 +195,10 @@ load_image (grub_gui_image_t self, const char *path)
  22. return grub_errno;
  23. if (self->bitmap && (self->bitmap != self->raw_bitmap))
  24. - grub_video_bitmap_destroy (self->bitmap);
  25. + {
  26. + grub_video_bitmap_destroy (self->bitmap);
  27. + self->bitmap = 0;
  28. + }
  29. if (self->raw_bitmap)
  30. grub_video_bitmap_destroy (self->raw_bitmap);
  31. --
  32. 2.26.2