Skip to content

Commit 356e4b2

Browse files
committed
objtool: Fix data alignment in elf_add_data()
Any data added to a section needs to be aligned in accordance with the section's sh_addralign value. Particularly strings added to a .str1.8 section. Otherwise you may get some funky strings. Fixes: dd590d4 ("objtool/klp: Introduce klp diff subcommand for diffing object files") Link: https://patch.msgid.link/d962fc0ca24fa0825cca8dad71932dccdd9312a9.1772681234.git.jpoimboe@kernel.org Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
1 parent 3223404 commit 356e4b2

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tools/objtool/elf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ void *elf_add_data(struct elf *elf, struct section *sec, const void *data, size_
13751375
memcpy(sec->data->d_buf, data, size);
13761376

13771377
sec->data->d_size = size;
1378-
sec->data->d_align = 1;
1378+
sec->data->d_align = sec->sh.sh_addralign;
13791379

13801380
offset = ALIGN(sec->sh.sh_size, sec->sh.sh_addralign);
13811381
sec->sh.sh_size = offset + size;

0 commit comments

Comments
 (0)