From nobody Sun Apr 12 05:57:05 2026 X-Original-To: dev-commits-src-branches@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 4ftfv61tlRz6YYfg for ; Sun, 12 Apr 2026 05:57:06 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftfv60D0Jz3mZg for ; Sun, 12 Apr 2026 05:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cP7NchEaxH/iCIBZ09SI2tJOpHTQI0bxZEOtP8tDJuU=; b=rGNMOVIxkFMar8NZfjVnYKFrchi664CtvnZBzZ/1TVkR0NT+KoPCP3V+4iYDkVzhpQRNYv KNLazLMunXPJyzXtVw4Ba0gOMHcMSqZ3Mw+9pep0jHcp+sNCtagfoy+CgRFNIiRpG7PTVA VXaeAjzgDe2NROt/P+jN0ROKo7b49MfN+bHIgJiU4HpX3TsRk0UYDLquLVwr1cjmahcgW3 Ar5NYB9B+0K7qKWUI2Au/+0wOThRJT78mP9yI20fEihknOhjNdacWNT0IbCjpqC+KgqWjt BlWjTPgCiRcq+wz6qC8Gc5P1KeHe6EwUp3fk1iWtefPKhZO8V/VVIBj9ndRZVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973426; a=rsa-sha256; cv=none; b=GJt4R96Jv3orcFusrMNqk02BSM2UCERWsQ9zcWmQC6YYZS1qZEsuAdT5Wqq68K16AuIudY TroinqHK0+et1LM0c5iCMMNNg8hw5eF0ElorosVwcC3Dyx2Pw4k9PxIQ8cj6ng5LO+5+XX CxC2PHvSkwOXIxr1/IsrKu9uqiuWjphcOrLBjJLz3G+uUdrXk1eU/gSotYC0iWsrDVTUNz LVctPBY83zgQHSt8SGUgPe6L/V4ObsYfgqUnC9yjqBjnmvnlGfQH+ix/wFf//FVMsudgb4 c0Ih3pjf7hmloasyuL92NKpi2uOPiFsCgOfEKfjNSnV5fTD12VGU7GtRdkzSxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cP7NchEaxH/iCIBZ09SI2tJOpHTQI0bxZEOtP8tDJuU=; b=ukfqCZk0fsA9SVo91s4ewWnc+zAbdfEZ+M9WX2NhM4EmH4W6TCoR3YoQb7OsshZCkWlyvl QWmcYWWiPw/KIp/3q7+7PwFuj/pIiOhnnTFx1/RYSZO5AenIMdBZTjwXhXMd0kVI3EUoG9 EwGAa07xSlNeOdb3KlxiuCMyu+suCZFkOANZDB4AdlP0Yb1cEXRRBS+sTfgcaTu1u7txDq +rjydputMc+tZTjI9/Of0oGLQ0l631IU1GgoUgV3vQMDKuZZ1WTc7tKtFfLU9VrK8k5I2D AiEiR2UXkKbTIV46/k3gSo5jneWV3aVGnP2hfHG01ilviUCglmqF4rbSIpxw/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfv56sDcz141g for ; Sun, 12 Apr 2026 05:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31276 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 408e20a69900 - stable/14 - sys/abi_compat.h: fix UB for bintime32 handling List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 408e20a699006bbe15546052db7b413b21603c2b Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:05 +0000 Message-Id: <69db3431.31276.5006661@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=408e20a699006bbe15546052db7b413b21603c2b commit 408e20a699006bbe15546052db7b413b21603c2b Author: Konstantin Belousov AuthorDate: 2026-01-12 04:46:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:45 +0000 sys/abi_compat.h: fix UB for bintime32 handling Do not cast and then access potentially unaligned uint64_t in the BT_CP() macro. Use freebsd32_uint64_t type and FU64_CP() for the frac member. Noted by: des Reviewed by: des, emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54663 (cherry picked from commit be1b2da855cc38531733b5c97891cd4a40a993bc) --- sys/compat/freebsd32/freebsd32.h | 2 +- sys/sys/abi_compat.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 36deb6bd06f2..b5671611c1eb 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -70,7 +70,7 @@ struct itimerspec32 { struct bintime32 { time32_t sec; - uint32_t frac[2]; + freebsd32_uint64_t frac; }; struct ffclock_estimate32 { diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 0a7110191430..bd99a21d8e23 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -77,7 +77,7 @@ #define BT_CP(src, dst, fld) do { \ CP((src).fld, (dst).fld, sec); \ - *(uint64_t *)&(dst).fld.frac[0] = (src).fld.frac; \ + FU64_CP((src).fld, (dst).fld, frac); \ } while (0) #endif /* !_COMPAT_H_ */