git: 1379cde85f61 - stable/15 - imgact_elf: Unconditionally initialize a variable in a note handler
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 16 Apr 2026 15:56:49 UTC
The branch stable/15 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=1379cde85f6177fa457aec9bd7a100424a990a60
commit 1379cde85f6177fa457aec9bd7a100424a990a60
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-04-08 04:19:56 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-04-16 15:56:26 +0000
imgact_elf: Unconditionally initialize a variable in a note handler
In the sb == NULL case, we are computing the size of the note using a
dummy sbuf drain handler which counts bytes and discards the contents of
the buffer, so the fact that "structsize" is uninitialized doesn't
matter. But, the compiler may complain about this, so we might as well
just initialize it unconditionally to silence the warning, as other
handlers already do.
PR: 292811
MFC after: 1 week
(cherry picked from commit 8a68c2509c00ae0dbeab64064bb600cfac787a73)
---
sys/kern/imgact_elf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 7410efca4807..c91fd8089487 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -2714,6 +2714,7 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep)
int structsize;
p = arg;
+ structsize = sizeof(Elf_Auxinfo);
if (sb == NULL) {
size = 0;
sb = sbuf_new(NULL, NULL, AT_COUNT * sizeof(Elf_Auxinfo),
@@ -2727,7 +2728,6 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep)
sbuf_delete(sb);
*sizep = size;
} else {
- structsize = sizeof(Elf_Auxinfo);
sbuf_bcat(sb, &structsize, sizeof(structsize));
PHOLD(p);
proc_getauxv(curthread, p, sb);