git: ea7f064a780b - stable/13 - libprocstat: copy all the 32-bit auxv entries
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Oct 2023 20:39:14 UTC
The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ea7f064a780b6f6bb023757a5eb8b997bd272687 commit ea7f064a780b6f6bb023757a5eb8b997bd272687 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2023-10-26 20:38:41 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2023-10-26 20:38:41 +0000 libprocstat: copy all the 32-bit auxv entries Use source struct size not the destination struct size so we copy all the auxv entries, not just the first half of them. Fix a style issue on an adjacent line. Reviewed by: markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D42200 (cherry picked from commit 8f06fabe39ac3ebca4ab448a456945008305a23f) --- lib/libprocstat/libprocstat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index b23a0a5b2120..f0542587cbdb 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -2437,8 +2437,8 @@ procstat_getauxv32_sysctl(pid_t pid, unsigned int *cntp) warn("sysctl: kern.proc.auxv: %d: %d", pid, errno); goto out; } - count = len / sizeof(Elf_Auxinfo); - auxv = malloc(count * sizeof(Elf_Auxinfo)); + count = len / sizeof(Elf32_Auxinfo); + auxv = malloc(count * sizeof(Elf_Auxinfo)); if (auxv == NULL) { warn("malloc(%zu)", count * sizeof(Elf_Auxinfo)); goto out;