diff options
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/depmod.c | 6 | ||||
| -rw-r--r-- | modutils/modutils-24.c | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/modutils/depmod.c b/modutils/depmod.c index d6cc8ed59..4718c4dcb 100644 --- a/modutils/depmod.c +++ b/modutils/depmod.c @@ -80,9 +80,11 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA && strncmp(ptr, "__ksymtab_", 10) == 0 ) { ptr += 10; - if (strncmp(ptr, "gpl", 3) == 0 || - strcmp(ptr, "strings") == 0) + if (strncmp(ptr, "gpl", 3) == 0 + || strcmp(ptr, "strings") == 0 + ) { continue; + } llist_add_to(&info->symbols, xstrdup(ptr)); ptr += strlen(ptr); } diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c index a878e740c..4ede01fe8 100644 --- a/modutils/modutils-24.c +++ b/modutils/modutils-24.c @@ -865,19 +865,23 @@ arch_apply_relocation(struct obj_file *f, break; case R_H8_PCREL16: v -= dot + 2; - if ((ElfW(Sword))v > 0x7fff || - (ElfW(Sword))v < -(ElfW(Sword))0x8000) + if ((ElfW(Sword))v > 0x7fff + || (ElfW(Sword))v < -(ElfW(Sword))0x8000 + ) { ret = obj_reloc_overflow; - else + } else { *(unsigned short *)loc = v; + } break; case R_H8_PCREL8: v -= dot + 1; - if ((ElfW(Sword))v > 0x7f || - (ElfW(Sword))v < -(ElfW(Sword))0x80) + if ((ElfW(Sword))v > 0x7f + || (ElfW(Sword))v < -(ElfW(Sword))0x80 + ) { ret = obj_reloc_overflow; - else + } else { *(unsigned char *)loc = v; + } break; #elif defined(__i386__) |