From nobody Wed Feb 05 10:33:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YnxR25Cssz5mY0n; Wed, 05 Feb 2025 10:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnxR24TwPz3jqt; Wed, 05 Feb 2025 10:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738751614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dj6hBLONiaERH6IslDU8zl5yO8NFNUiPWV/i9eTr1Is=; b=l2b9lipD8p+W4SMaPfo04GVgpoLVKqORAITXPRXdsxq++htC6tH74gEoSR/t4KohAp6EFn Ac1f0ZvH+lhe9DDhMWNu6P2zhMb6i1ZkGwZTQtYQ41/BbPHO5ekoxt2DKCtynsEG7AZmCI VCdX3+5C49Ci4CJI2RUsrJd4t507qSkOzIoboh0OGAPjxlVVwbCN1kOLjUXy102P72RjUw mx7bDGtB4+DJSaifJGTUkEwRfqfbZucyPi03zMMYJBvdJ8jAvmmYDKQCSry3zfYzqsrnsX Ah9lKb1zzoJG25AIimYJ5dEzu1dx+grvr81NuuaNaLZ4h9pQCJpGUqzhJGhcLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738751614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dj6hBLONiaERH6IslDU8zl5yO8NFNUiPWV/i9eTr1Is=; b=UOmkgNVr0+06FBKuIO8qHaJV+6gj3ldByFCeqN9buqp0W/UQmKlfwnwL0+Mf+UXCIzlU0S sIZbLLewYMdNohchwc0L5Tq1VNf2BAw7xwoKwwmzcRS7ckp3hOHL02fEh2a80n7Otx5Wpc bqpJVkfcyFwlztcATY5Rn4vkiCVuzzKAZFeaWFzfHKjy4h/LQ9BJh/sOBgmtbGxiHghkro J0qi3W/wlWvkR7FCFt5kHloyIdZPG6AmmS39esVIPTnWR50OqSeSw4mku1mK+vEg/0dtDU CNSKoJB6c3ybt4G6Ecx8b+fHATtU4IEO2AwkO3bar9OqBmWtzSK7oG31w0HdpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738751614; a=rsa-sha256; cv=none; b=IwRvPiCZgcjbpyOjnw8StV63yOwc6DGKZeJ5q5pACQYEYFkF/HbEF1yHtbhymsatUEPndt LE2KbJSFtm6mejwrcH315O4luKVFf9xNHUf33V43UCmrIF0pxwO9vH00xRCIheEG68r0On xiphLar9W+WxU5uGV/KrFRL9U7mYCg/KPKM1E8beJYMnMmtQ7Fukph10flbFy86nFqarw5 cV9/0Y+ZKWXcPtO55zhm8/TSxnhgtE8apBbmshNsHSDSn0bxSVAY9JxqCgg8kGWIN1kgA3 2ejJAiMrcBUkUyiY1cTLCdGHhyMdOqtT/A6IMVxtGk2wkBuSM+nx838xCsqMbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YnxR23pgxzpWt; Wed, 05 Feb 2025 10:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 515AXYUf037651; Wed, 5 Feb 2025 10:33:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515AXYxr037647; Wed, 5 Feb 2025 10:33:34 GMT (envelope-from git) Date: Wed, 5 Feb 2025 10:33:34 GMT Message-Id: <202502051033.515AXYxr037647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e917958c3667 - main - rtld: clear any holes in the struct utrace_rtld passed to kernel logger List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e917958c36670131ab42e8f2c849b708a3216e37 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e917958c36670131ab42e8f2c849b708a3216e37 commit e917958c36670131ab42e8f2c849b708a3216e37 Author: Konstantin Belousov AuthorDate: 2025-02-04 22:33:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-02-05 10:33:29 +0000 rtld: clear any holes in the struct utrace_rtld passed to kernel logger This should avoid an (almost) false positive from Valgrind, by filling the padding on LP64. PR: 284563 Reported by: Paul Floyd Reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D48854 --- 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 169ec0200ea5..aab20407b00d 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -337,14 +337,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)); }