Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix alignment when reading core notes

Browse Source 
Both desc and note header needs to be aligned.  Therefore, we need
to realign after skipping past desc as well.

While at it, fix the other alignment fix to use roundup() macro.
This commit is contained in:
mgorny 2020-01-08 17:22:40 +00:00
parent 77791248de
commit adb864df5e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/lib/libc/sys/t_ptrace_wait.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: t_ptrace_wait.c,v 1.145 2019/12/25 02:23:37 kamil Exp $ */
/* $NetBSD: t_ptrace_wait.c,v 1.146 2020/01/08 17:22:40 mgorny Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: t_ptrace_wait.c,v 1.145 2019/12/25 02:23:37 kamil Exp $");
__RCSID("$NetBSD: t_ptrace_wait.c,v 1.146 2020/01/08 17:22:40 mgorny Exp $");
#define __LEGACY_PT_LWPINFO
@ -7837,8 +7837,7 @@ static ssize_t core_find_note(const char *core_path,
offset += note_hdr.n_namesz;
/* fix to alignment */
offset = ((offset + core_hdr.p_align - 1)
/ core_hdr.p_align) * core_hdr.p_align;
offset = roundup(offset, core_hdr.p_align);
/* if name & type matched above */
if (ret != -1) {
@ -7850,6 +7849,8 @@ static ssize_t core_find_note(const char *core_path,
}
offset += note_hdr.n_descsz;
/* fix to alignment */
offset = roundup(offset, core_hdr.p_align);
}
}