From 068de5be49a296491027df01c0bb1731c5b2ca56 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Wed, 5 Feb 2025 00:33:11 +0200 Subject: [PATCH] rtld: clear any holes in the struct utrace_rtld passed to kernel logger PR: 284563 (cherry picked from commit e917958c36670131ab42e8f2c849b708a3216e37) --- libexec/rtld-elf/rtld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 47680c36318..cc504666c64 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -335,14 +335,14 @@ ld_utrace_log(int event, void *handle, void *mapbase, size_t mapsize, struct utrace_rtld ut; static const char rtld_utrace_sig[RTLD_UTRACE_SIG_SZ] = RTLD_UTRACE_SIG; + memset(&ut, 0, sizeof(ut)); /* clear holes */ memcpy(ut.sig, rtld_utrace_sig, sizeof(ut.sig)); ut.event = event; ut.handle = handle; ut.mapbase = mapbase; ut.mapsize = mapsize; ut.refcnt = refcnt; - bzero(ut.name, sizeof(ut.name)); - if (name) + if (name != NULL) strlcpy(ut.name, name, sizeof(ut.name)); utrace(&ut, sizeof(ut)); }