mirror of
https://git.proxmox.com/git/grub2
synced 2025-10-05 03:40:14 +00:00
a7a440dc54
NTFS is disabled with secure boot enabled anyway now, and these patches caused a regression both for grub during boot and grub_mount in userspace. Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From: Lidong Chen <lidong.chen@oracle.com>
|
|
Date: Tue, 21 Jan 2025 19:02:39 +0000
|
|
Subject: misc: Ensure consistent overflow error messages
|
|
|
|
Update the overflow error messages to make them consistent
|
|
across the GRUB code.
|
|
|
|
Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
(cherry picked from commit f8795cde217e21539c2f236bcbb1a4bf521086b3)
|
|
---
|
|
grub-core/fs/ntfs.c | 2 +-
|
|
grub-core/fs/ntfscomp.c | 2 +-
|
|
grub-core/video/readers/png.c | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
|
|
index 66ea467..542b01e 100644
|
|
--- a/grub-core/fs/ntfs.c
|
|
+++ b/grub-core/fs/ntfs.c
|
|
@@ -364,7 +364,7 @@ retry:
|
|
goto retry;
|
|
}
|
|
}
|
|
- return grub_error (GRUB_ERR_BAD_FS, "run list overflown");
|
|
+ return grub_error (GRUB_ERR_BAD_FS, "run list overflow");
|
|
}
|
|
ctx->curr_vcn = ctx->next_vcn;
|
|
ctx->next_vcn += read_run_data (run, c1, 0); /* length of current VCN */
|
|
diff --git a/grub-core/fs/ntfscomp.c b/grub-core/fs/ntfscomp.c
|
|
index 4bf95c8..8859470 100644
|
|
--- a/grub-core/fs/ntfscomp.c
|
|
+++ b/grub-core/fs/ntfscomp.c
|
|
@@ -30,7 +30,7 @@ static grub_err_t
|
|
decomp_nextvcn (struct grub_ntfs_comp *cc)
|
|
{
|
|
if (cc->comp_head >= cc->comp_tail)
|
|
- return grub_error (GRUB_ERR_BAD_FS, "compression block overflown");
|
|
+ return grub_error (GRUB_ERR_BAD_FS, "compression block overflow");
|
|
if (grub_disk_read
|
|
(cc->disk,
|
|
(cc->comp_table[cc->comp_head].next_lcn -
|
|
diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
|
|
index 3163e97..aa7524b 100644
|
|
--- a/grub-core/video/readers/png.c
|
|
+++ b/grub-core/video/readers/png.c
|
|
@@ -626,7 +626,7 @@ static grub_err_t
|
|
grub_png_output_byte (struct grub_png_data *data, grub_uint8_t n)
|
|
{
|
|
if (--data->raw_bytes < 0)
|
|
- return grub_error (GRUB_ERR_BAD_FILE_TYPE, "image size overflown");
|
|
+ return grub_error (GRUB_ERR_BAD_FILE_TYPE, "image size overflow");
|
|
|
|
if (data->cur_column == 0)
|
|
{
|