From: Tobias Stoeckmann Date: Sun, 20 Oct 2024 14:42:39 +0000 (+0200) Subject: libkmod: Adjust style X-Git-Tag: v34~187 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ebbde938099aaf931878ebbed3c48fc85c6f248;p=thirdparty%2Fkmod.git libkmod: Adjust style Add a blank between variable declaration and function calls. Signed-off-by: Tobias Stoeckmann Reviewed-by: Emil Velikov Link: https://github.com/kmod-project/kmod/pull/196 Signed-off-by: Lucas De Marchi --- diff --git a/libkmod/libkmod-elf.c b/libkmod/libkmod-elf.c index 1a334b91..a54c56a4 100644 --- a/libkmod/libkmod-elf.c +++ b/libkmod/libkmod-elf.c @@ -212,6 +212,7 @@ static inline int elf_get_section_info(const struct kmod_elf *elf, uint16_t idx, if (elf->x32) { Elf32_Shdr *hdr; + if (!elf_range_valid(elf, off, sizeof(*hdr))) goto fail; *size = READV(sh_size); @@ -219,6 +220,7 @@ static inline int elf_get_section_info(const struct kmod_elf *elf, uint16_t idx, nameoff = READV(sh_name); } else { Elf64_Shdr *hdr; + if (!elf_range_valid(elf, off, sizeof(*hdr))) goto fail; *size = READV(sh_size); @@ -289,12 +291,14 @@ struct kmod_elf *kmod_elf_new(const void *memory, off_t size) elf->header.machine = READV(e_machine) if (elf->x32) { Elf32_Ehdr *hdr; + shdr_size = sizeof(Elf32_Shdr); if (!elf_range_valid(elf, 0, shdr_size)) goto invalid; LOAD_HEADER; } else { Elf64_Ehdr *hdr; + shdr_size = sizeof(Elf64_Shdr); if (!elf_range_valid(elf, 0, shdr_size)) goto invalid; @@ -804,9 +808,11 @@ int kmod_elf_get_symbols(const struct kmod_elf *elf, struct kmod_modversion **ar elf_get_uint(elf, sym_off + offsetof(typeof(*s), field), sizeof(s->field)) if (elf->x32) { Elf32_Sym *s; + name_off = READV(st_name); } else { Elf64_Sym *s; + name_off = READV(st_name); } #undef READV @@ -849,12 +855,14 @@ int kmod_elf_get_symbols(const struct kmod_elf *elf, struct kmod_modversion **ar elf_get_uint(elf, sym_off + offsetof(typeof(*s), field), sizeof(s->field)) if (elf->x32) { Elf32_Sym *s; + name_off = READV(st_name); crc = READV(st_value); info = READV(st_info); shndx = READV(st_shndx); } else { Elf64_Sym *s; + name_off = READV(st_name); crc = READV(st_value); info = READV(st_info); @@ -1022,11 +1030,13 @@ int kmod_elf_get_dependency_symbols(const struct kmod_elf *elf, elf_get_uint(elf, sym_off + offsetof(typeof(*s), field), sizeof(s->field)) if (elf->x32) { Elf32_Sym *s; + name_off = READV(st_name); secidx = READV(st_shndx); info = READV(st_info); } else { Elf64_Sym *s; + name_off = READV(st_name); secidx = READV(st_shndx); info = READV(st_info); @@ -1119,11 +1129,13 @@ int kmod_elf_get_dependency_symbols(const struct kmod_elf *elf, elf_get_uint(elf, sym_off + offsetof(typeof(*s), field), sizeof(s->field)) if (elf->x32) { Elf32_Sym *s; + name_off = READV(st_name); secidx = READV(st_shndx); info = READV(st_info); } else { Elf64_Sym *s; + name_off = READV(st_name); secidx = READV(st_shndx); info = READV(st_info);