Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-22 07:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

loader/i386/bsdXX: Fix loading after unaligned module

Browse Source 
Current code implicitly assumes that aligning chunk_size + *kern_end is
the same as aligning on curload which is not the case because
chunk_size starts at zero even if *kern_end is unaligned and ALIGN_PAGE
moved curload to an aligned position but not *kern_end + chunk_size.

This fixes booting of FreeBSD with zfs module.

Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Vladimir Serbinenko authored and Daniel Kiper committed 2023-12-12 17:14:27 +01:00
1 parent 89fbe0cac9
commit c129e44e7f
1 file changed
+12 -8
Download Patch File Download Diff File Expand all files Collapse all files
grub-core/loader/i386/bsdXX.c
+12 -8
View File
@@ -88,10 +88,9 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
Elf_Shnum shnum; Elf_Shnum shnum;
grub_addr_t curload, module; grub_addr_t curload, module;
grub_err_t err; grub_err_t err;
grub_size_t chunk_size = 0;
void *chunk_src; void *chunk_src;
curload = module = ALIGN_PAGE (*kern_end); module = ALIGN_PAGE (*kern_end);
err = read_headers (file, argv[0], &e, &shdr); err = read_headers (file, argv[0], &e, &shdr);
if (err != GRUB_ERR_NONE) if (err != GRUB_ERR_NONE)
@@ -101,6 +100,8 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
if (err != GRUB_ERR_NONE) if (err != GRUB_ERR_NONE)
goto out; goto out;
curload = module;
for (s = shdr; s < (Elf_Shdr *) ((grub_uint8_t *) shdr + shnum * e.e_shentsize); for (s = shdr; s < (Elf_Shdr *) ((grub_uint8_t *) shdr + shnum * e.e_shentsize);
s = (Elf_Shdr *) ((grub_uint8_t *) s + e.e_shentsize)) s = (Elf_Shdr *) ((grub_uint8_t *) s + e.e_shentsize))
{ {
@@ -108,21 +109,24 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
continue; continue;
if (s->sh_addralign) if (s->sh_addralign)
chunk_size = ALIGN_UP (chunk_size + *kern_end, s->sh_addralign) curload = ALIGN_UP (curload, s->sh_addralign);
- *kern_end;
chunk_size += s->sh_size; curload += s->sh_size;
} }
*kern_end = ALIGN_PAGE (curload);
{ {
grub_relocator_chunk_t ch; grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_addr (relocator, &ch, err = grub_relocator_alloc_chunk_addr (relocator, &ch,
module, chunk_size); module, curload - module);
if (err != GRUB_ERR_NONE) if (err != GRUB_ERR_NONE)
goto out; goto out;
chunk_src = get_virtual_current_address (ch); chunk_src = get_virtual_current_address (ch);
} }
curload = module;
for (s = shdr; s < (Elf_Shdr *) ((grub_uint8_t *) shdr + shnum * e.e_shentsize); for (s = shdr; s < (Elf_Shdr *) ((grub_uint8_t *) shdr + shnum * e.e_shentsize);
s = (Elf_Shdr *) ((grub_uint8_t *) s + e.e_shentsize)) s = (Elf_Shdr *) ((grub_uint8_t *) s + e.e_shentsize))
{ {
@@ -141,13 +145,13 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
{ {
default: default:
case SHT_PROGBITS: case SHT_PROGBITS:
err = load (file, argv[0], (grub_uint8_t *) chunk_src + curload - *kern_end, err = load (file, argv[0], (grub_uint8_t *) chunk_src + curload - module,
s->sh_offset, s->sh_size); s->sh_offset, s->sh_size);
if (err != GRUB_ERR_NONE) if (err != GRUB_ERR_NONE)
goto out; goto out;
break; break;
case SHT_NOBITS: case SHT_NOBITS:
grub_memset ((grub_uint8_t *) chunk_src + curload - *kern_end, 0, grub_memset ((grub_uint8_t *) chunk_src + curload - module, 0,
s->sh_size); s->sh_size);
break; break;
} }