From nobody Sun Jul 6 23:18:37 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 4bb3G61Thtz60ZgW; Sun, 06 Jul 2025 23:18:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bb3G5670Jz3tNX; Sun, 06 Jul 2025 23:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751843917; 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=eZdZ4OjfUhZIC3xE7gcNFolYoJ/42QU3b43jgR6+92o=; b=xy9ReEWDdPXqBSuhxkFx8HWoT5topIePJFPlo/LLhW8TMArtlXC8vnVvlNm5PWO5XRTGk8 hYvUH4ZFOTSwoyHxVcGX+H2/1+woylf+7PA39pe43v3Q6HSYtPt/JHaUeu+JE/B8ZUgN3f USLbJy6F6Jte2N3cBjXOMnjX++tW5p5/3KCEnD+vGwzORfZWFL4207Dm22iM4e5MAaGCNk IF4EdMvBhCahyIpLoqJx6+5lEmig/nAIQiSIaILio5EF4A/P+8BXIimAQ4XzNB3Imj6D+H SfN58vX9WAVdwaExpmUcx5mQ7YEoVzYkfdUnso5ofgf5ZHHDCrP4TI1M91aQDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751843917; 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=eZdZ4OjfUhZIC3xE7gcNFolYoJ/42QU3b43jgR6+92o=; b=gK5boR8tsat6IWUUjodnf1+APGQDN4j7HvD3NiJEDfiyiVZNd3rL1Tlc3Mdebt6hOwlRLT dVaqsWGrTTyeSXIPFzOo15FcpnqAumlpP/ahz4KZWDBVdB5J3KMBy4HvO1AFWQ8bDJlOrA A4h8R9x8p24Hnd4YizXDzBMBhIJzJICto9AqnPEe6X5WL1dkIoGVr4UW5vPMKKGyXH/PbZ ARolymXj/04MRq0X0zIMcm1WBua+o+TLfEabbga2fE8CiNHcVHLR2cTEBpOk6y4RIjRRAZ Z5yyGWYUR0jj3b8oSJp5HJqAxT3wL9mJXIWG4aefejGJ7lHhq0EIYB5xVhurFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751843917; a=rsa-sha256; cv=none; b=yWtAYcyc6TRD1+iutN9v3lbL7tt7jzAPjCR42qIbo0AG1Yz/9knm78usdkq5xaPyMeqeA4 6CWwHyNF7j57Y0g4W9gMVleN3iOi2Ngh8IoHcUQL7GbTT9M9uheyQ8HlesVV4qXdD2+POc c/CWOaBxr7aMjbBUjoANlp/DHhS1NpYBahefh1A+NTMNkmjNUHKHvEX3TkzB+kzJtCcFxC tYG+bXOqFhbYID+2nKW73QnN2LBZeU1p4t5dAq8VI+esouddE880T5ci6pmbyfWBlbNfRN SHq6tDZHR2iBTpwQCzzLmNAe0I5bVTvk2Z0BggoT9HbkgpopT9S3jJFsI9xE2Q== 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 4bb3G55MP4z9ld; Sun, 06 Jul 2025 23:18:37 +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 566NIbbf031123; Sun, 6 Jul 2025 23:18:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 566NIb2l031120; Sun, 6 Jul 2025 23:18:37 GMT (envelope-from git) Date: Sun, 6 Jul 2025 23:18:37 GMT Message-Id: <202507062318.566NIb2l031120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: be6c405c4d34 - main - socket: Add MSG_CMSG_CLOFORK flag 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be6c405c4d34366618ab55e3a730090f6c672968 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=be6c405c4d34366618ab55e3a730090f6c672968 commit be6c405c4d34366618ab55e3a730090f6c672968 Author: Ricardo Branco AuthorDate: 2025-05-09 21:43:51 +0000 Commit: Mark Johnston CommitDate: 2025-07-06 23:08:28 +0000 socket: Add MSG_CMSG_CLOFORK flag Reviewed by: kib MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1698 --- sys/kern/uipc_usrreq.c | 3 ++- sys/sys/socket.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 72bd0246db11..0056dac65c7d 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -3463,7 +3463,8 @@ unp_externalize(struct mbuf *control, struct mbuf **controlp, int flags) UNP_LINK_UNLOCK_ASSERT(); - fdflags = (flags & MSG_CMSG_CLOEXEC) ? O_CLOEXEC : 0; + fdflags = ((flags & MSG_CMSG_CLOEXEC) ? O_CLOEXEC : 0) | + ((flags & MSG_CMSG_CLOFORK) ? O_CLOFORK : 0); error = 0; if (controlp != NULL) /* controlp == NULL => free control messages */ diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 8db981c9747c..cdd4fa3b4b89 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -479,6 +479,9 @@ struct msghdr { #define MSG_MORETOCOME 0x00100000 /* additional data pending */ #define MSG_TLSAPPDATA 0x00200000 /* do not soreceive() alert rec. (TLS) */ #endif +#if __BSD_VISIBLE +#define MSG_CMSG_CLOFORK 0x00400000 /* make received fds close-on-fork */ +#endif /* * Header for ancillary data objects in msg_control buffer.