RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-04-28 22:17:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

create-kpatch-module: Fix -Wconversion warnings

Browse Source 
Fix warnings reported by -Wconversion,-Wno-sign-conversion CFLAGS.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
This commit is contained in:
Kamalesh Babulal 2020-02-11 08:45:30 -05:00
parent ea9e708df0
commit 37e950a653
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kmod/patch/kpatch-patch.h
View File

@ -40,7 +40,7 @@ struct kpatch_patch_dynrela {
char *name; char *name;
char *objname; char *objname;
int external; int external;
int addend; long addend;
}; };
struct kpatch_pre_patch_callback { struct kpatch_pre_patch_callback {

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

@ -46,17 +46,17 @@ static void create_dynamic_rela_sections(struct kpatch_elf *kelf, struct section
struct section *dynsec; struct section *dynsec;
struct symbol *sym; struct symbol *sym;
struct rela *rela; struct rela *rela;
int index, nr, offset, dest_offset, objname_offset, name_offset; unsigned int index, nr, offset, dest_offset, objname_offset, name_offset;
ksyms = ksymsec->data->d_buf; ksyms = ksymsec->data->d_buf;
krelas = krelasec->data->d_buf; krelas = krelasec->data->d_buf;
nr = krelasec->data->d_size / sizeof(*krelas); nr = (unsigned int)(krelasec->data->d_size / sizeof(*krelas));
dynsec = create_section_pair(kelf, ".kpatch.dynrelas", sizeof(*dynrelas), nr); dynsec = create_section_pair(kelf, ".kpatch.dynrelas", sizeof(*dynrelas), nr);
dynrelas = dynsec->data->d_buf; dynrelas = dynsec->data->d_buf;
for (index = 0; index < nr; index++) { for (index = 0; index < nr; index++) {
offset = index * sizeof(*krelas); offset = index * (unsigned int)sizeof(*krelas);
/* /*
* To fill in each dynrela entry, find dest location, * To fill in each dynrela entry, find dest location,
@ -69,28 +69,28 @@ static void create_dynamic_rela_sections(struct kpatch_elf *kelf, struct section
if (!rela) if (!rela)
ERROR("find_rela_by_offset"); ERROR("find_rela_by_offset");
sym = rela->sym; sym = rela->sym;
dest_offset = rela->addend; dest_offset = (unsigned int)rela->addend;
/* Get objname offset */ /* Get objname offset */
rela = find_rela_by_offset(krelasec->rela, rela = find_rela_by_offset(krelasec->rela,
offset + offsetof(struct kpatch_relocation, objname)); (unsigned int)(offset + offsetof(struct kpatch_relocation, objname)));
if (!rela) if (!rela)
ERROR("find_rela_by_offset"); ERROR("find_rela_by_offset");
objname_offset = rela->addend; objname_offset = (unsigned int)rela->addend;
/* Get ksym (.kpatch.symbols entry) and symbol name offset */ /* Get ksym (.kpatch.symbols entry) and symbol name offset */
rela = find_rela_by_offset(krelasec->rela, rela = find_rela_by_offset(krelasec->rela,
offset + offsetof(struct kpatch_relocation, ksym)); (unsigned int)(offset + offsetof(struct kpatch_relocation, ksym)));
if (!rela) if (!rela)
ERROR("find_rela_by_offset"); ERROR("find_rela_by_offset");
ksym = ksyms + (rela->addend / sizeof(*ksyms)); ksym = ksyms + (rela->addend / sizeof(*ksyms));
offset = index * sizeof(*ksyms); offset = (unsigned int )(index * sizeof(*ksyms));
rela = find_rela_by_offset(ksymsec->rela, rela = find_rela_by_offset(ksymsec->rela,
offset + offsetof(struct kpatch_symbol, name)); (unsigned int)(offset + offsetof(struct kpatch_symbol, name)));
if (!rela) if (!rela)
ERROR("find_rela_by_offset"); ERROR("find_rela_by_offset");
name_offset = rela->addend; name_offset = (unsigned int)rela->addend;
/* Fill in dynrela entry */ /* Fill in dynrela entry */
dynrelas[index].src = ksym->src; dynrelas[index].src = ksym->src;
@ -104,23 +104,23 @@ static void create_dynamic_rela_sections(struct kpatch_elf *kelf, struct section
rela->sym = sym; rela->sym = sym;
rela->type = R_X86_64_64; rela->type = R_X86_64_64;
rela->addend = dest_offset; rela->addend = dest_offset;
rela->offset = index * sizeof(*dynrelas); rela->offset = (unsigned int)(index * sizeof(*dynrelas));
/* name */ /* name */
ALLOC_LINK(rela, &dynsec->rela->relas); ALLOC_LINK(rela, &dynsec->rela->relas);
rela->sym = strsec->secsym; rela->sym = strsec->secsym;
rela->type = R_X86_64_64; rela->type = R_X86_64_64;
rela->addend = name_offset; rela->addend = name_offset;
rela->offset = index * sizeof(*dynrelas) + \ rela->offset = (unsigned int)(index * sizeof(*dynrelas) + \
offsetof(struct kpatch_patch_dynrela, name); offsetof(struct kpatch_patch_dynrela, name));
/* objname */ /* objname */
ALLOC_LINK(rela, &dynsec->rela->relas); ALLOC_LINK(rela, &dynsec->rela->relas);
rela->sym = strsec->secsym; rela->sym = strsec->secsym;
rela->type = R_X86_64_64; rela->type = R_X86_64_64;
rela->addend = objname_offset; rela->addend = objname_offset;
rela->offset = index * sizeof(*dynrelas) + \ rela->offset = (unsigned int)(index * sizeof(*dynrelas) + \
offsetof(struct kpatch_patch_dynrela, objname); offsetof(struct kpatch_patch_dynrela, objname));
} }
} }
@ -188,7 +188,7 @@ int main(int argc, char *argv[])
struct section *symtab, *sec; struct section *symtab, *sec;
struct section *ksymsec, *krelasec, *strsec; struct section *ksymsec, *krelasec, *strsec;
struct arguments arguments; struct arguments arguments;
int ksyms_nr, krelas_nr; unsigned int ksyms_nr, krelas_nr;
arguments.debug = 0; arguments.debug = 0;
argp_parse (&argp, argc, argv, 0, 0, &arguments); argp_parse (&argp, argc, argv, 0, 0, &arguments);
@ -214,12 +214,12 @@ int main(int argc, char *argv[])
ksymsec = find_section_by_name(&kelf->sections, ".kpatch.symbols"); ksymsec = find_section_by_name(&kelf->sections, ".kpatch.symbols");
if (!ksymsec) if (!ksymsec)
ERROR("missing .kpatch.symbols section"); ERROR("missing .kpatch.symbols section");
ksyms_nr = ksymsec->data->d_size / sizeof(struct kpatch_symbol); ksyms_nr = (unsigned int)(ksymsec->data->d_size / sizeof(struct kpatch_symbol));
krelasec = find_section_by_name(&kelf->sections, ".kpatch.relocations"); krelasec = find_section_by_name(&kelf->sections, ".kpatch.relocations");
if (!krelasec) if (!krelasec)
ERROR("missing .kpatch.relocations section"); ERROR("missing .kpatch.relocations section");
krelas_nr = krelasec->data->d_size / sizeof(struct kpatch_relocation); krelas_nr = (unsigned int)(krelasec->data->d_size / sizeof(struct kpatch_relocation));
if (krelas_nr != ksyms_nr) if (krelas_nr != ksyms_nr)
ERROR("number of krelas and ksyms do not match"); ERROR("number of krelas and ksyms do not match");