RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-02-16 17:57:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1014 from sm00th/covscan-fixes

Browse Source 
Covscan fixes
This commit is contained in:
Joe Lawrence 2019-08-06 09:59:21 -04:00 committed by GitHub
commit c4fafedf3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kpatch-build/create-diff-object.c
View File

@ -373,6 +373,9 @@ static int rela_equal(struct rela *rela1, struct rela *rela2)
if (!rela_toc1 && !rela_toc2)
return toc_data1 == toc_data2;
if (!rela_toc1 || !rela_toc2)
return 0;
if (rela_toc1->string)
return rela_toc2->string && !strcmp(rela_toc1->string, rela_toc2->string);
@ -1235,6 +1238,10 @@ static void rela_insn(struct section *sec, struct rela *rela, struct insn *insn)
start = (unsigned long)sec->base->data->d_buf;
end = start + sec->base->sh.sh_size;
if (end <= start)
ERROR("bad section size");
rela_addr = start + rela->offset;
for (insn_addr = start; insn_addr < end; insn_addr += insn->length) {
insn_init(insn, (void *)insn_addr, 1);
@ -1319,6 +1326,7 @@ static void kpatch_replace_sections_syms(struct kpatch_elf *kelf)
int start, end;
if (sym->type == STT_SECTION ||
!sym->sec ||
sym->sec != rela->sym->sec)
continue;
@ -1902,6 +1910,8 @@ static int fixup_group_size(struct kpatch_elf *kelf, int offset)
/* last group */
struct section *fixupsec;
fixupsec = find_section_by_name(&kelf->sections, ".fixup");
if (!fixupsec)
ERROR("missing .fixup section");
return fixupsec->sh.sh_size - offset;
}
@ -2040,7 +2050,6 @@ static void kpatch_regenerate_special_section(struct kpatch_elf *kelf,
}
}
group_size = 0;
src_offset = 0;
dest_offset = 0;
for ( ; src_offset < sec->base->sh.sh_size; src_offset += group_size) {
@ -2181,6 +2190,9 @@ static void kpatch_regenerate_orc_sections(struct kpatch_elf *kelf)
return;
orc_entry_size = atoi(str);
if (!orc_entry_size)
ERROR("bad ORC_STRUCT_SIZE");
LIST_HEAD(newrelas);
orc_sec = find_section_by_name(&kelf->sections, ".orc_unwind");
@ -2411,15 +2423,13 @@ static void kpatch_mark_ignored_functions_same(struct kpatch_elf *kelf)
static void kpatch_create_kpatch_arch_section(struct kpatch_elf *kelf, char *objname)
{
struct special_section *special;
struct kpatch_arch *entries;
struct symbol *strsym;
struct section *sec, *karch_sec;
struct rela *rela;
int nr, index = 0;
nr = sizeof(special_sections) / sizeof(special_sections[0]);
karch_sec = create_section_pair(kelf, ".kpatch.arch", sizeof(*entries), nr);
entries = karch_sec->data->d_buf;
karch_sec = create_section_pair(kelf, ".kpatch.arch", sizeof(struct kpatch_arch), nr);
/* lookup strings symbol */
strsym = find_symbol_by_name(&kelf->symbols, ".kpatch.strings");
@ -2440,7 +2450,7 @@ static void kpatch_create_kpatch_arch_section(struct kpatch_elf *kelf, char *obj
rela->sym = sec->secsym;
rela->type = ABSOLUTE_RELA_TYPE;
rela->addend = 0;
rela->offset = index * sizeof(*entries) + \
rela->offset = index * sizeof(struct kpatch_arch) + \
offsetof(struct kpatch_arch, sec);
/* entries[index].objname */
@ -2448,7 +2458,7 @@ static void kpatch_create_kpatch_arch_section(struct kpatch_elf *kelf, char *obj
rela->sym = strsym;
rela->type = ABSOLUTE_RELA_TYPE;
rela->addend = offset_of_string(&kelf->strings, objname);
rela->offset = index * sizeof(*entries) + \
rela->offset = index * sizeof(struct kpatch_arch) + \
offsetof(struct kpatch_arch, objname);
index++;
@ -3110,7 +3120,7 @@ static void kpatch_create_mcount_sections(struct kpatch_elf *kelf)
struct section *sec, *relasec;
struct symbol *sym;
struct rela *rela;
void **funcs, *newdata;
void *newdata;
unsigned char *insn;
nr = 0;
@ -3120,9 +3130,8 @@ static void kpatch_create_mcount_sections(struct kpatch_elf *kelf)
nr++;
/* create text/rela section pair */
sec = create_section_pair(kelf, "__mcount_loc", sizeof(*funcs), nr);
sec = create_section_pair(kelf, "__mcount_loc", sizeof(void*), nr);
relasec = sec->rela;
funcs = sec->data->d_buf;
/* populate sections */
index = 0;
@ -3141,13 +3150,16 @@ static void kpatch_create_mcount_sections(struct kpatch_elf *kelf)
rela->sym = sym;
rela->type = R_X86_64_64;
rela->addend = 0;
rela->offset = index * sizeof(*funcs);
rela->offset = index * sizeof(void*);
/*
* Modify the first instruction of the function to "callq
* __fentry__" so that ftrace will be happy.
*/
newdata = malloc(sym->sec->data->d_size);
if (!newdata)
ERROR("malloc");
memcpy(newdata, sym->sec->data->d_buf, sym->sec->data->d_size);
sym->sec->data->d_buf = newdata;
insn = newdata;
@ -3454,6 +3466,7 @@ int main(int argc, char *argv[])
log_debug("no changed functions were found, but callbacks exist\n");
else {
log_debug("no changed functions were found\n");
free(hint);
return EXIT_STATUS_NO_CHANGE;
}
}
@ -3505,6 +3518,9 @@ int main(int argc, char *argv[])
* buffers from the relas lists.
*/
symtab = find_section_by_name(&kelf_out->sections, ".symtab");
if (!symtab)
ERROR("missing .symtab section");
list_for_each_entry(sec, &kelf_out->sections, list) {
if (!is_rela_section(sec))
continue;

9
kpatch-build/create-klp-module.c
View File

@ -244,7 +244,6 @@ static void create_klp_relasecs_and_syms(struct kpatch_elf *kelf, struct section
static void create_klp_arch_sections(struct kpatch_elf *kelf, char *strings)
{
struct section *karch, *sec, *base = NULL;
struct kpatch_arch *entries;
struct rela *rela, *rela2;
char *secname, *objname = NULL;
char buf[256];
@ -254,11 +253,10 @@ static void create_klp_arch_sections(struct kpatch_elf *kelf, char *strings)
if (!karch)
return;
entries = karch->data->d_buf;
nr = karch->data->d_size / sizeof(*entries);
nr = karch->data->d_size / sizeof(struct kpatch_arch);
for (index = 0; index < nr; index++) {
offset = index * sizeof(*entries);
offset = index * sizeof(struct kpatch_arch);
/* Get the base section (.parainstructions or .altinstructions) */
rela = find_rela_by_offset(karch->rela,
@ -488,6 +486,9 @@ int main(int argc, char *argv[])
/* Rebuild rela sections, new klp rela sections will be rebuilt too. */
symtab = find_section_by_name(&kelf->sections, ".symtab");
if (!symtab)
ERROR("missing .symtab section");
list_for_each_entry(sec, &kelf->sections, list) {
if (!is_rela_section(sec))
continue;

3
kpatch-build/create-kpatch-module.c
View File

@ -231,6 +231,9 @@ int main(int argc, char *argv[])
kpatch_reindex_elements(kelf);
symtab = find_section_by_name(&kelf->sections, ".symtab");
if (!symtab)
ERROR("missing .symtab section");
list_for_each_entry(sec, &kelf->sections, list) {
if (!is_rela_section(sec))
continue;

15
kpatch-build/kpatch-elf.c
View File

@ -567,6 +567,7 @@ void kpatch_create_strtab(struct kpatch_elf *kelf)
void kpatch_create_symtab(struct kpatch_elf *kelf)
{
struct section *symtab;
struct section *strtab;
struct symbol *sym;
char *buf;
size_t size;
@ -600,7 +601,11 @@ void kpatch_create_symtab(struct kpatch_elf *kelf)
symtab->data->d_size = size;
/* update symtab section header */
symtab->sh.sh_link = find_section_by_name(&kelf->sections, ".strtab")->index;
strtab = find_section_by_name(&kelf->sections, ".strtab");
if (!strtab)
ERROR("missing .strtab section");
symtab->sh.sh_link = strtab->index;
symtab->sh.sh_info = nr_local;
}
@ -753,6 +758,7 @@ void kpatch_write_output_elf(struct kpatch_elf *kelf, Elf *elf, char *outfile)
{
int fd;
struct section *sec;
struct section *shstrtab;
Elf *elfout;
GElf_Ehdr eh, ehout;
Elf_Scn *scn;
@ -782,7 +788,12 @@ void kpatch_write_output_elf(struct kpatch_elf *kelf, Elf *elf, char *outfile)
ehout.e_machine = eh.e_machine;
ehout.e_type = eh.e_type;
ehout.e_version = EV_CURRENT;
ehout.e_shstrndx = find_section_by_name(&kelf->sections, ".shstrtab")->index;
shstrtab = find_section_by_name(&kelf->sections, ".shstrtab");
if (!shstrtab)
ERROR("missing .shstrtab section");
ehout.e_shstrndx = shstrtab->index;
/* add changed sections */
list_for_each_entry(sec, &kelf->sections, list) {

2
kpatch-build/lookup.c
View File

@ -185,7 +185,7 @@ static char *make_modname(char *modname)
name = strdup(basename(modname));
if (!name)
perror("strdup");
ERROR("strdup");
cur = name; /* use cur as tmp */
while (*cur != '\0') {