[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/5] loader: Update error conditionals to use enums
|
From: |
Alec Brown |
|
Subject: |
[PATCH v2 5/5] loader: Update error conditionals to use enums |
|
Date: |
Fri, 12 Aug 2022 18:25:49 -0400 |
In grub-core/loader/i386/bsdXX.c and grub-core/loader/multiboot_elfxx.c, error
conditionals are simplified to statements such as "if (err)". Even though the
assumption that non-zero values give errors is correct, it would be clearer and
more consistent to compare these conditionals to GRUB_ERR_NONE.
Signed-off-by: Alec Brown <alec.r.brown@oracle.com>
---
grub-core/loader/i386/bsdXX.c | 38 +++++++++++++++---------------
grub-core/loader/multiboot_elfxx.c | 6 ++---
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/grub-core/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c
index dffa79d56..09d909f1b 100644
--- a/grub-core/loader/i386/bsdXX.c
+++ b/grub-core/loader/i386/bsdXX.c
@@ -94,7 +94,7 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct
grub_relocator *relocator,
curload = module = ALIGN_PAGE (*kern_end);
err = read_headers (file, argv[0], &e, &shdr);
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
err = grub_elf_get_shnum (&e, &shnum);
@@ -118,7 +118,7 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct
grub_relocator *relocator,
grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
module, chunk_size);
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
chunk_src = get_virtual_current_address (ch);
}
@@ -143,7 +143,7 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct
grub_relocator *relocator,
case SHT_PROGBITS:
err = load (file, argv[0], (grub_uint8_t *) chunk_src + curload -
*kern_end,
s->sh_offset, s->sh_size);
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
break;
case SHT_NOBITS:
@@ -159,11 +159,11 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct
grub_relocator *relocator,
err = grub_freebsd_add_meta_module (argv[0], FREEBSD_MODTYPE_ELF_MODULE_OBJ,
argc - 1, argv + 1, module,
curload - module);
- if (! err)
+ if (err == GRUB_ERR_NONE)
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA
| FREEBSD_MODINFOMD_ELFHDR,
&e, sizeof (e));
- if (! err)
+ if (err == GRUB_ERR_NONE)
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA
| FREEBSD_MODINFOMD_SHDR,
shdr, shnum * e.e_shentsize);
@@ -192,7 +192,7 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator
*relocator,
curload = module = ALIGN_PAGE (*kern_end);
err = read_headers (file, argv[0], &e, &shdr);
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
err = grub_elf_get_shnum (&e, &shnum);
@@ -225,7 +225,7 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator
*relocator,
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
module, chunk_size);
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
chunk_src = get_virtual_current_address (ch);
@@ -252,7 +252,7 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator
*relocator,
(grub_uint8_t *) chunk_src + module
+ s->sh_addr - *kern_end,
s->sh_offset, s->sh_size);
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
break;
case SHT_NOBITS:
@@ -285,7 +285,7 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator
*relocator,
curload - module);
out:
grub_free (shdr);
- if (err)
+ if (err != GRUB_ERR_NONE)
return err;
return SUFFIX (grub_freebsd_load_elf_meta) (relocator, file, argv[0],
kern_end);
}
@@ -313,7 +313,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator
*relocator,
grub_size_t chunk_size;
err = read_headers (file, filename, &e, &shdr);
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
err = grub_elf_get_shnum (&e, &shnum);
@@ -323,7 +323,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator
*relocator,
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
FREEBSD_MODINFOMD_ELFHDR, &e,
sizeof (e));
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
for (s = shdr; s < (Elf_Shdr *) ((grub_uint8_t *) shdr + shnum *
e.e_shentsize);
@@ -351,7 +351,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator
*relocator,
grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
symtarget, chunk_size);
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
sym_chunk = get_virtual_current_address (ch);
}
@@ -414,14 +414,14 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct
grub_relocator *relocator,
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
FREEBSD_MODINFOMD_DYNAMIC, &dynamic,
sizeof (dynamic));
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
}
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
FREEBSD_MODINFOMD_SSYM, &symstart,
sizeof (symstart));
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
@@ -429,7 +429,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator
*relocator,
sizeof (symend));
out:
grub_free (shdr);
- if (err)
+ if (err != GRUB_ERR_NONE)
return err;
*kern_end = ALIGN_PAGE (symend);
@@ -455,7 +455,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator
*relocator,
grub_addr_t symtarget;
err = read_headers (file, filename, &e, &shdr);
- if (err)
+ if (err != GRUB_ERR_NONE)
{
grub_free (shdr);
return grub_errno;
@@ -492,7 +492,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator
*relocator,
grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
symtarget, chunk_size);
- if (err)
+ if (err != GRUB_ERR_NONE)
goto out;
sym_chunk = get_virtual_current_address (ch);
}
@@ -566,7 +566,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator
*relocator,
sizeof (symtab));
out:
grub_free (shdr);
- if (err)
+ if (err != GRUB_ERR_NONE)
return err;
*kern_end = ALIGN_PAGE (symtarget + chunk_size);
@@ -590,7 +590,7 @@ SUFFIX(grub_openbsd_find_ramdisk) (grub_file_t file,
Elf_Shnum shnum;
err = read_headers (file, filename, &e, &shdr);
- if (err)
+ if (err != GRUB_ERR_NONE)
{
grub_free (shdr);
return err;
diff --git a/grub-core/loader/multiboot_elfxx.c
b/grub-core/loader/multiboot_elfxx.c
index b6c0e23ca..b76451f73 100644
--- a/grub-core/loader/multiboot_elfxx.c
+++ b/grub-core/loader/multiboot_elfxx.c
@@ -138,7 +138,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
load_size, mld->align ?
mld->align : 1,
mld->preference,
mld->avoid_efi_boot_services);
- if (err)
+ if (err != GRUB_ERR_NONE)
{
grub_dprintf ("multiboot_loader", "Cannot allocate memory for OS
image\n");
return err;
@@ -173,7 +173,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
err = grub_relocator_alloc_chunk_addr (GRUB_MULTIBOOT
(relocator), &ch,
phdr(i)->p_paddr,
phdr(i)->p_memsz);
- if (err)
+ if (err != GRUB_ERR_NONE)
{
grub_dprintf ("multiboot_loader", "Cannot allocate memory for
OS image\n");
return err;
@@ -284,7 +284,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
sh->sh_size, sh->sh_addralign,
GRUB_RELOCATOR_PREFERENCE_NONE,
mld->avoid_efi_boot_services);
- if (err)
+ if (err != GRUB_ERR_NONE)
{
grub_dprintf ("multiboot_loader", "Error loading shdr %d\n", i);
return err;
--
2.27.0
- [PATCH v2 0/5] Fix coverity bugs and add checks for elf values in grub-core, Alec Brown, 2022/08/12
- [PATCH v2 1/5] elf: Validate number of elf section header table entries, Alec Brown, 2022/08/12
- [PATCH v2 3/5] elf: Validate number of elf program header table entries, Alec Brown, 2022/08/12
- [PATCH v2 2/5] elf: Validate elf section header table index for section name string table, Alec Brown, 2022/08/12
- [PATCH v2 4/5] util/grub-module-verifierXX.c: Changed get_shnum() return type, Alec Brown, 2022/08/12
- [PATCH v2 5/5] loader: Update error conditionals to use enums,
Alec Brown <=
- Re: [PATCH v2 0/5] Fix coverity bugs and add checks for elf values in grub-core, Darren Kenny, 2022/08/15