diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-05-18 11:52:35 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-05-18 11:52:35 +1000 |
| commit | 873552f7f0b95520ce3b3c51a42a65742c62df33 (patch) | |
| tree | 8ca011fd6b9140c7726b8320ad660554f98c3d08 /fs/proc/vmcore.c | |
| parent | 5bdbd4878c6a1fcc4b21a03ffa686ad4df641ed4 (diff) | |
| parent | 60592fb6b67c653beaa2e7acad9a9d7aa0b71dff (diff) | |
| download | linux-next-873552f7f0b95520ce3b3c51a42a65742c62df33.tar.gz | |
Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git
Diffstat (limited to 'fs/proc/vmcore.c')
| -rw-r--r-- | fs/proc/vmcore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 03f5963914a1..cb80a7703d58 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -877,7 +877,7 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, phdr.p_offset = roundup(note_off, PAGE_SIZE); phdr.p_vaddr = phdr.p_paddr = 0; phdr.p_filesz = phdr.p_memsz = phdr_sz; - phdr.p_align = 0; + phdr.p_align = 4; /* Add merged PT_NOTE program header*/ tmp = elfptr + sizeof(Elf64_Ehdr); @@ -1068,7 +1068,7 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, phdr.p_offset = roundup(note_off, PAGE_SIZE); phdr.p_vaddr = phdr.p_paddr = 0; phdr.p_filesz = phdr.p_memsz = phdr_sz; - phdr.p_align = 0; + phdr.p_align = 4; /* Add merged PT_NOTE program header*/ tmp = elfptr + sizeof(Elf32_Ehdr); |