From nobody Tue Nov 17 17:06:06 2026 X-Original-To: dev-commits-src-all@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 4jTWMz2zbJz71Rgg for ; Tue, 17 Nov 2026 17:06:07 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWMy6ZR7z4JVt for ; Tue, 17 Nov 2026 17:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935166; 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=jOdBiCUFqarhG+tnLp4pEG991MnsrrDEdAAUXfR/yco=; b=NlZPJvClx/XHTVz1nWVQIRTy7U4Kyehii0+gPDciRWeuNY1RTn2btPxI1gGPa7vn9cubZy KgUAP4UwAETrtwmiHemkcx9VPNHlzJ72y4vTI6+z/NB8SbV6+GCOoPreGAnF1bWfUtGJ9b 18fYTHlO9mGkdzt/YJ1LdDz+dkpuXbHgjImxRu6cDq1jApzB7Zc3C0Uail+ksyE88jI/lI LVNexAJo1JqWqxLjcPb0pz5YIG353S3JnJHGGfzjrzyTNxhzhn8PjoaZ+YOXuCJMaXI0aQ EDDEaCL/5T3g5HSszF6uxYSpOOnWKttMshEsxY5Wvha859TKwbZ5hhlgXXHWZw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935166; b=EW/meORMx/rpSnI5IEs442uwN3Bzg8tCjtSZO5wB7Q7nOHW3oe9cdlEBb1YG2/aynf4Tdt QQen5/OcxiJs9GQZGhaKcPtGyKjM0+BsJcqBFkCOC+q4lEWMFz97L+mQwgwjqlan1gfXVd BABYjCyEMUVu4cKcU8hZ5b81G4CEKO/6GLPMP0MAUiX9Ri8bviECJYbbnfXxsUAfWtxwn0 vizxbmDlDZeKlLvHIANNvOvYiX7kY2U9/v51VBydAscJiHBG5QbW0l7TtXzzfUeL3Fy7iF HEf/F4SvkdMeg+a5bQ7b5plFJAiLoj7szfaqdyyzSPXOoK7RewhshQqNZeZvLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935166; 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=jOdBiCUFqarhG+tnLp4pEG991MnsrrDEdAAUXfR/yco=; b=LiWAUu3NpDlVnJCJq35q+TPARykgVFqIMZyo0W87XYZbIBR6BLJfUnUxqJPE3GPd1wbpoP Y60EJ6LZawWuQ5wb18lJr1WrjR+Qi8l87Yl4ogQnELZjMtj/JNy3zRe+EzEjkePZKKr+dn JRrxJBkcfCHqbfyjbSEzjCojUqtZ4j9QK3NDj1gRMVZ5ImJ2ZzCkYNeteCPPovegNh2CtI RkBPbDl9KA1slJTZYWpS9FfaaQy/FNVm2VWZlPxXU+XT9uuwqkmnJqXDUgkCmDER4GVxK6 GMbp6YHRbXLRACwg6pQWez8cVJYyrF0fSVEGESW9o7PkXHF1c+pA5siF4OWd1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWMy6D3szrSj for ; Tue, 17 Nov 2026 17:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1dfb7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:06:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9a38d35b14bc - stable/15 - freebsd32: Avoid modifying a shared control message List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9a38d35b14bc96b54c85cf6c5bbc6b51fe95df8e Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:06:06 +0000 Message-Id: <6afc897e.1dfb7.376de307@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9a38d35b14bc96b54c85cf6c5bbc6b51fe95df8e commit 9a38d35b14bc96b54c85cf6c5bbc6b51fe95df8e Author: Mark Johnston AuthorDate: 2026-11-12 19:18:29 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:23 +0000 freebsd32: Avoid modifying a shared control message freebsd32_copy_msg_out() copies out received control messages. The cmsg ABI differs between the 32-bit and native ABIs in that the 32-bit ABI requires only 4-byte alignment for message bodies, see CMSG_ALIGN. When the control message is read from the socket buffer with MSG_PEEK, short messages which fit into an mbuf are copied into private storage, but larger messages are returned by acquiring a counted reference on the underlying mbuf cluster still attached to the socket buffer. When the underlying storage is shared, the non-atomic, temporary modification of the control message header in freebsd32_copy_msg_out() can be abused to corrupt the message queue; this can be leveraged to escalate privileges. Approved by: so Security: FreeBSD-SA-26:86.freebsd32 Security: CVE-2026-101321 Reported by: OpenAI Security Research Team Reviewed by: brooks, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D61355 --- sys/compat/freebsd32/freebsd32_misc.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index bb4548660278..b6a097cd495e 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -1510,9 +1510,9 @@ freebsd32_cmsg_convert(const struct cmsghdr *cm, void *data, socklen_t datalen) static int freebsd32_copy_msg_out(struct msghdr *msg, struct mbuf *control) { - struct cmsghdr *cm; + struct cmsghdr *cm, cm_out; void *data; - socklen_t clen, datalen, datalen_out, oldclen; + socklen_t clen, datalen, datalen_out; int error; caddr_t ctlbuf; int len, copylen; @@ -1538,9 +1538,10 @@ freebsd32_copy_msg_out(struct msghdr *msg, struct mbuf *control) datalen_out = freebsd32_cmsg_convert(cm, data, datalen); /* - * Copy out the message header. Preserve the native - * message size in case we need to inspect the message - * contents later. + * Copy out the message header. Adjust it first to + * satisfy the 32-bit ABI's alignment requirements. + * Note that the underlying storage may still be + * resident in the socket buffer. */ copylen = sizeof(struct cmsghdr); if (len < copylen) { @@ -1548,11 +1549,11 @@ freebsd32_copy_msg_out(struct msghdr *msg, struct mbuf *control) m_dispose_extcontrolm(m); goto exit; } - oldclen = cm->cmsg_len; - cm->cmsg_len = FREEBSD32_ALIGN(sizeof(struct cmsghdr)) + + memcpy(&cm_out, cm, copylen); + cm_out.cmsg_len = + FREEBSD32_ALIGN(sizeof(struct cmsghdr)) + datalen_out; - error = copyout(cm, ctlbuf, copylen); - cm->cmsg_len = oldclen; + error = copyout(&cm_out, ctlbuf, copylen); if (error != 0) goto exit;