0004-fs-hfs-Fix-stack-OOB-write-with-grub_strcpy.patch 1.2 KB

123456789101112131415161718192021222324252627282930313233343536
  1. From 157e6e2a3da139dc2e08cf41b49115965cdaa1d3 Mon Sep 17 00:00:00 2001
  2. From: B Horn <b@horn.uk>
  3. Date: Sun, 12 May 2024 02:48:33 +0100
  4. Subject: [PATCH] fs/hfs: Fix stack OOB write with grub_strcpy()
  5. Replaced with grub_strlcpy().
  6. Fixes: CVE-2024-45782
  7. Fixes: CVE-2024-56737
  8. Fixes: https://savannah.gnu.org/bugs/?66599
  9. Reported-by: B Horn <b@horn.uk>
  10. Signed-off-by: B Horn <b@horn.uk>
  11. Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
  12. Upstream: 417547c10410b714e43f08f74137c24015f8f4c3
  13. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  14. ---
  15. grub-core/fs/hfs.c | 2 +-
  16. 1 file changed, 1 insertion(+), 1 deletion(-)
  17. diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c
  18. index 91dc0e69c..920112b03 100644
  19. --- a/grub-core/fs/hfs.c
  20. +++ b/grub-core/fs/hfs.c
  21. @@ -379,7 +379,7 @@ grub_hfs_mount (grub_disk_t disk)
  22. volume name. */
  23. key.parent_dir = grub_cpu_to_be32_compile_time (1);
  24. key.strlen = data->sblock.volname[0];
  25. - grub_strcpy ((char *) key.str, (char *) (data->sblock.volname + 1));
  26. + grub_strlcpy ((char *) key.str, (char *) (data->sblock.volname + 1), sizeof (key.str));
  27. if (grub_hfs_find_node (data, (char *) &key, data->cat_root,
  28. 0, (char *) &dir, sizeof (dir)) == 0)
  29. --
  30. 2.50.1