|
 |
f0ad2aa |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
f0ad2aa |
From: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
|
|
|
f0ad2aa |
Date: Wed, 6 Apr 2022 18:17:43 +0530
|
|
|
f0ad2aa |
Subject: [PATCH] fs/f2fs: Do not copy file names that are too long
|
|
|
f0ad2aa |
|
|
|
f0ad2aa |
A corrupt f2fs file system might specify a name length which is greater
|
|
|
f0ad2aa |
than the maximum name length supported by the GRUB f2fs driver.
|
|
|
f0ad2aa |
|
|
|
f0ad2aa |
We will allocate enough memory to store the overly long name, but there
|
|
|
f0ad2aa |
are only F2FS_NAME_LEN bytes in the source, so we would read past the end
|
|
|
f0ad2aa |
of the source.
|
|
|
f0ad2aa |
|
|
|
f0ad2aa |
While checking directory entries, do not copy a file name with an invalid
|
|
|
f0ad2aa |
length.
|
|
|
f0ad2aa |
|
|
|
f0ad2aa |
Signed-off-by: Sudhakar Kuppusamy <sudhakar@linux.ibm.com>
|
|
|
f0ad2aa |
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
|
|
f0ad2aa |
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
|
f0ad2aa |
(cherry picked from commit 9a891f638509e031d322c94e3cbcf38d36f3993a)
|
|
|
f0ad2aa |
---
|
|
|
f0ad2aa |
grub-core/fs/f2fs.c | 4 ++++
|
|
|
f0ad2aa |
1 file changed, 4 insertions(+)
|
|
|
f0ad2aa |
|
|
|
f0ad2aa |
diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c
|
|
|
f0ad2aa |
index 8898b235e0..df6beb544c 100644
|
|
|
f0ad2aa |
--- a/grub-core/fs/f2fs.c
|
|
|
f0ad2aa |
+++ b/grub-core/fs/f2fs.c
|
|
|
f0ad2aa |
@@ -1003,6 +1003,10 @@ grub_f2fs_check_dentries (struct grub_f2fs_dir_iter_ctx *ctx)
|
|
|
f0ad2aa |
|
|
|
f0ad2aa |
ftype = ctx->dentry[i].file_type;
|
|
|
f0ad2aa |
name_len = grub_le_to_cpu16 (ctx->dentry[i].name_len);
|
|
|
f0ad2aa |
+
|
|
|
f0ad2aa |
+ if (name_len >= F2FS_NAME_LEN)
|
|
|
f0ad2aa |
+ return 0;
|
|
|
f0ad2aa |
+
|
|
|
f0ad2aa |
filename = grub_malloc (name_len + 1);
|
|
|
f0ad2aa |
if (!filename)
|
|
|
f0ad2aa |
return 0;
|