35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
From daec67a7ea73b859e1e0b6a4e9122157c7525676 Mon Sep 17 00:00:00 2001
|
||
|
|
From: B Horn <b@horn.uk>
|
||
|
|
Date: Sun, 12 May 2024 02:03:33 +0100
|
||
|
|
Subject: [PATCH 02/20] fs/ufs: Fix a heap OOB write
|
||
|
|
|
||
|
|
grub_strcpy() was used to copy a symlink name from the filesystem
|
||
|
|
image to a heap allocated buffer. This led to a OOB write to adjacent
|
||
|
|
heap allocations. Fix by using grub_strlcpy().
|
||
|
|
|
||
|
|
Fixes: CVE-2024-45781
|
||
|
|
|
||
|
|
Reported-by: B Horn <b@horn.uk>
|
||
|
|
Signed-off-by: B Horn <b@horn.uk>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
---
|
||
|
|
grub-core/fs/ufs.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c
|
||
|
|
index a354c92d93..01235101b4 100644
|
||
|
|
--- a/grub-core/fs/ufs.c
|
||
|
|
+++ b/grub-core/fs/ufs.c
|
||
|
|
@@ -463,7 +463,7 @@ grub_ufs_lookup_symlink (struct grub_ufs_data *data, int ino)
|
||
|
|
/* Check against zero is paylindromic, no need to swap. */
|
||
|
|
if (data->inode.nblocks == 0
|
||
|
|
&& INODE_SIZE (data) <= sizeof (data->inode.symlink))
|
||
|
|
- grub_strcpy (symlink, (char *) data->inode.symlink);
|
||
|
|
+ grub_strlcpy (symlink, (char *) data->inode.symlink, sz);
|
||
|
|
else
|
||
|
|
{
|
||
|
|
if (grub_ufs_read_file (data, 0, 0, 0, sz, symlink) < 0)
|
||
|
|
--
|
||
|
|
2.48.1
|
||
|
|
|