From nobody Tue Nov 17 17:01:53 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 4jTWH61BcBz71Q6M for ; Tue, 17 Nov 2026 17:01:54 +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 4jTWH571yzz3Pv3 for ; Tue, 17 Nov 2026 17:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934914; 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=WQNaeQkzwrnE86RkKVQdDmyxCHmGAVXdZH4hMePsyTo=; b=xHvD+gzUnS3S5nXLUERysWnc6UX7pvkElbdYQgDuo6/fE7mf/dClg3ungrPZRIhGyKTPaa B7nSY4I0kdsYkwhgsaWS69VxCY1y+Rpmhe5erPx+9TuV8MtLTStMfXBuKxD0+flQ9gUCUq HWxoNNKqSe1sOSm6JfHuhVNUL1DkKWSpvjKkP+PHvAJwPI8zAEhlLli90JRgAsmKWn+XDw PTWOhh37Zyoz1/Bo4l5advHk/VeMSjdTKcw0h1MRoHDYB2LsR1NeECo6h8ka1iWZLZdu24 DbnMDDBBlK4gBzr3a1e7Z8d0mhy+pON7ec9KxGhJxPKaCfBX3iDEfNgOktVgzQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794934914; b=epg7rVDK8Ha0KYMqn/kfSkjH1PqWBlYldxAyW0Q0xVOezHI5ePNMRe3Mn99t5zLrLfIuEo z7SW58jBPXHGoKb50UoKk7YY/aquXYnRwG2KcRgZGt+JSq5qtv9L0FO7YL8jHDN4zg2ZY8 l7Rs92ofKaWt0mikeTWtHAjUG4tKhhd0GAcSnbkqpSOoy403a6NrhvAL+Yk2tG2oHL4khY Grj1V2GdBB9FOafOBuPFeylWunv184JMC8eul68VBcNKgZXNX/eFrxd5GuEHGnSHM7peMQ oLp9B4hzE8Rz5dl9fa1h1hCCZ6uQz9IihbjE5UBKLLvEYMbxKOASEifZ89ABnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794934914; 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=WQNaeQkzwrnE86RkKVQdDmyxCHmGAVXdZH4hMePsyTo=; b=bCL3cjZhMFZvI4duYTASd2VkqA4y75KPAwFx+ZH+pZQys2g7zEMfSdoRrrdXXXfjF+Qru3 JZEhEvXBax7aziF9MHyzPoVCTySwjnkKYYe7YpwEhVSuMwubnFTqS5qPQr690DgmMPvcsZ ecQq4F4LcaAmMYrvfNk40KOD5DHTrN+cYjrboQD3F4NXWANCvANUC4B5Zx1wl3SegLbPHq yZ44BU5H8yLr5EmE/q00l27pLbDGYwUd5N5CWBWeYegEXsrHXcHR0dZaTz/3RjQM1PKV8C 5vCp/QhFmOt6NTrJ/7ZXZP11ZTuFp+1l1fu0O5hNpjxMhPGjf7rcWAl+ogY46Q== 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 4jTWH56Nc5zrTj for ; Tue, 17 Nov 2026 17:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c0ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:01:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 12bccefc137e - main - 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/main X-Git-Reftype: branch X-Git-Commit: 12bccefc137e73f3311d8282eeb80667b85beffb Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:01:53 +0000 Message-Id: <6afc8881.1c0ff.ac6279e@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=12bccefc137e73f3311d8282eeb80667b85beffb commit 12bccefc137e73f3311d8282eeb80667b85beffb Author: Mark Johnston AuthorDate: 2026-11-12 19:18:29 +0000 Commit: Mark Johnston CommitDate: 2026-11-17 16:57:01 +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 9e5e943d023d..a6604fffad34 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -1512,9 +1512,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; @@ -1540,9 +1540,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) { @@ -1550,11 +1551,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;