Skip to content

[PW_SID:1070304] riscv: Check the return value of reloc handlers #1654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linux-riscv-bot wants to merge 1 commit into
base: workflow__riscv__fixes
Choose a base branch
from
+16 −8
Open

[PW_SID:1070304] riscv: Check the return value of reloc handlers #1654

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions arch/riscv/kernel/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ static const struct relocation_handlers reloc_handlers[] = {
/* 192-255 nonstandard ABI extensions */
};

static void
static int
process_accumulated_relocations(struct module *me,
struct hlist_head **relocation_hashtable,
struct list_head *used_buckets_list)
Expand Down Expand Up @@ -625,6 +625,7 @@ process_accumulated_relocations(struct module *me,
int curr_type;
void *location;
long buffer;
int res, error = 0;

list_for_each_entry_safe(bucket_iter, bucket_iter_tmp,
used_buckets_list, head) {
Expand All @@ -637,18 +638,27 @@ process_accumulated_relocations(struct module *me,
&rel_head_iter->rel_entry,
head) {
curr_type = rel_entry_iter->type;
reloc_handlers[curr_type].reloc_handler(
me, &buffer, rel_entry_iter->value);
if (!error) {
res = reloc_handlers[curr_type].reloc_handler(
me, &buffer, rel_entry_iter->value);
if (res)
error = res;
}
kfree(rel_entry_iter);
}
reloc_handlers[curr_type].accumulate_handler(
me, location, buffer);
if (!error) {
res = reloc_handlers[curr_type].accumulate_handler(
me, location, buffer);
if (res)
error = res;
}
kfree(rel_head_iter);
}
kfree(bucket_iter);
}

kvfree(*relocation_hashtable);
return error;
}

static int add_relocation_to_accumulate(struct module *me, int type,
Expand Down Expand Up @@ -887,10 +897,8 @@ int apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
return res;
}

process_accumulated_relocations(me, &relocation_hashtable,
return process_accumulated_relocations(me, &relocation_hashtable,
&used_buckets_list);

return 0;
}

int module_finalize(const Elf_Ehdr *hdr,
Expand Down
Loading