RepoMirrors/kpatch
1
0
Fork 0
mirror of https://github.com/dynup/kpatch synced 2025-01-11 15:49:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #853 from jpoimboe/paravirt-alignment-panic

Browse Source 
create-klp-module: Properly align merged .parainstructions sections
This commit is contained in:
Joe Lawrence 2018-05-21 17:17:37 -04:00 committed by GitHub
commit ba5f3a9900
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,6 +292,27 @@ static void create_klp_arch_sections(struct kpatch_elf *kelf, char *strings)
* single .klp.arch.vmlinux..parainstructions section
*/
old_size = sec->data->d_size;
/*
* Due to a quirk in how .parainstructions gets linked, the
* section size doesn't encompass the last 4 bytes of the last
* entry. Align the old size properly before merging.
*/
if (!strcmp(base->name, ".parainstructions")) {
char *str;
static int align_mask = 0;
if (!align_mask) {
str = getenv("PARA_STRUCT_SIZE");
if (!str)
ERROR("PARA_STRUCT_SIZE not set");
align_mask = atoi(str) - 1;
}
old_size = (old_size + align_mask) & ~align_mask;
}
new_size = old_size + base->data->d_size;
sec->data->d_buf = realloc(sec->data->d_buf, new_size);
sec->data->d_size = new_size;