hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-14 06:12:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

truss: Decode correctly 64bits arguments on 32bits arm.

Browse Source 
Mostly revert ebbc3140ca.
We don't need to special-case anything for arm64, the check for the pointer
size is already done for us, just keep the bits about having arm and arm64
having to add padding for 32bits binaries.

MFC after:	1 week
This commit is contained in:
Olivier Houchard 2021-09-23 01:23:07 +02:00
parent b31c5a2532
commit f4b7018af1
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.bin/truss/syscalls.c
View File

@ -792,14 +792,11 @@ print_mask_arg32(bool (*decoder)(FILE *, uint32_t, uint32_t *), FILE *fp,
* decoding arguments.
*/
static void
quad_fixup(struct procabi *abi, struct syscall_decode *sc)
quad_fixup(struct syscall_decode *sc)
{
int offset, prev;
u_int i;
#ifndef __aarch64__
(void)abi;
#endif
offset = 0;
prev = -1;
for (i = 0; i < sc->nargs; i++) {
@ -820,13 +817,10 @@ quad_fixup(struct procabi *abi, struct syscall_decode *sc)
* not aligned, the calling convention inserts
* a 32-bit pad argument that should be skipped.
*/
#ifdef __aarch64__
if (abi->pointer_size == sizeof(uint32_t))
#endif
if (sc->args[i].offset % 2 == 1) {
sc->args[i].offset++;
offset++;
}
if (sc->args[i].offset % 2 == 1) {
sc->args[i].offset++;
offset++;
}
#endif
offset++;
default:
@ -860,7 +854,7 @@ add_syscall(struct procabi *abi, u_int number, struct syscall *sc)
* procabi instead.
*/
if (abi->pointer_size == 4)
quad_fixup(abi, &sc->decode);
quad_fixup(&sc->decode);
if (number < nitems(abi->syscalls)) {
assert(abi->syscalls[number] == NULL);