From nobody Sun Jul 6 23:18:36 2025 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 4bb3G504mCz60Zfj; Sun, 06 Jul 2025 23:18:37 +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 4bb3G44F9rz3tSn; Sun, 06 Jul 2025 23:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751843916; 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=HEsYfleZ7UenU8UXH60AB86Rf11NWrmzB81B14mhSGk=; b=YgIPvMEkxYFR/l2ngUN/w5BdGdZ9vs5cS8aHxJGQEIjt62r63j0GZYfpkC9oLNtjjuw5D7 mRg/1f1DQ3l6qXvl7+/KKc7W1djgz5NHsObySvNG9CfthTlgR+ikA6vrS3BAPRToVRiu/k meeyW9ADf15QkXP4H1AgWSeDy+eLb6lYsVfgOtMbo7SGHFgj+IR5kZqhwsftK8EJ3fV06w UKn/sT9e54vM9WRVB+uMqecAMczOkyEdKUhbOp5b5lj/iZd5H2NbvsB2vQwE3UIuXBu+cR rpgASKc1JII4/zC3iiHGJcWIpvHkmt1oHgLRhu2cVUhdo1GPQxudkW3EcyqVWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751843916; 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=HEsYfleZ7UenU8UXH60AB86Rf11NWrmzB81B14mhSGk=; b=jAtkTWt0pv4gJFGmiw8Ck2Jp9FNhPxnxr277r+1qPyBkelPFjUEagnJAcidRg5dl7kT2P1 bLJxKBBzKV1H8fGR3bYvGrM9/Er25sXrmWRAUUKSWFiFdTfU94ugI960JfujGTOANNuuQw 8n7q1MVj4MidPM7ecrvGYB76jX5BvMwyJ9SasmU9vDO41O2Qg1yb5BmCG6nkzv34AztHoj wSXmn6KQzv07CjNp5KPJVXxoAP2sp1BPio7GKrBvWL9epQUW08ZOcIQS/OW+Q7cfgtdr9Y Q8oqcohjhYMrVcTic4uiXEatBU0I/cFdlKnDf4UHimfzsVycG68gH4OulIYQmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751843916; a=rsa-sha256; cv=none; b=jqI8Hn72Kq5n9DAPu7JBvrGif21WdhNyfj+8gPu2vwwB9q4S/z2b2Xq29IWR53NKWq5bWG Mey5TRY44HEJzw/X6M2nGvXz+sWGpCbMcifNjMIjFsbXehbUI3zuNtb9kCJ4XKD2zOQtrR xAzlw63074j6vJMMb/cImswRTwEn4qbjNl/54MtzRQJ7PybGPi4FZ4UYn0pIZvbSaT5MBn tn7nIEvE++P9GEWie16siMOBw/FTPcZ+qALLcobKWUzDHiCRwnczvfLPz/TwHGjEsjAuGC /vCDZT5LYQyyi4blKTBEL9Xmi5PHxmRKeQzkJcWPZaTxRJnxQTWrwbMMezjg+A== 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 4bb3G43dRKz9wn; Sun, 06 Jul 2025 23:18:36 +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 566NIaq4031089; Sun, 6 Jul 2025 23:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 566NIaeR031086; Sun, 6 Jul 2025 23:18:36 GMT (envelope-from git) Date: Sun, 6 Jul 2025 23:18:36 GMT Message-Id: <202507062318.566NIaeR031086@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: 04a481b743c5 - main - socket: Add SOCK_CLOFORK flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 04a481b743c56392c34d5250327895bdb84b1160 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=04a481b743c56392c34d5250327895bdb84b1160 commit 04a481b743c56392c34d5250327895bdb84b1160 Author: Ricardo Branco AuthorDate: 2025-05-09 21:39:46 +0000 Commit: Mark Johnston CommitDate: 2025-07-06 23:08:24 +0000 socket: Add SOCK_CLOFORK flag Reviewed by: kib MFC after: 1 month Pull Request: https://github.com/freebsd/freebsd-src/pull/1698 --- sys/kern/uipc_syscalls.c | 13 +++++++++++-- sys/sys/socket.h | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index ad8485028987..133724ac76c5 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -151,6 +151,10 @@ kern_socket(struct thread *td, int domain, int type, int protocol) type &= ~SOCK_CLOEXEC; oflag |= O_CLOEXEC; } + if ((type & SOCK_CLOFORK) != 0) { + type &= ~SOCK_CLOFORK; + oflag |= O_CLOFORK; + } if ((type & SOCK_NONBLOCK) != 0) { type &= ~SOCK_NONBLOCK; fflag |= FNONBLOCK; @@ -352,7 +356,8 @@ kern_accept4(struct thread *td, int s, struct sockaddr *sa, int flags, goto done; #endif error = falloc_caps(td, &nfp, &fd, - (flags & SOCK_CLOEXEC) ? O_CLOEXEC : 0, &fcaps); + ((flags & SOCK_CLOEXEC) != 0 ? O_CLOEXEC : 0) | + ((flags & SOCK_CLOFORK) != 0 ? O_CLOFORK : 0), &fcaps); if (error != 0) goto done; SOCK_LOCK(head); @@ -435,7 +440,7 @@ int sys_accept4(struct thread *td, struct accept4_args *uap) { - if (uap->flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK)) + if ((uap->flags & ~(SOCK_CLOEXEC | SOCK_CLOFORK | SOCK_NONBLOCK)) != 0) return (EINVAL); return (accept1(td, uap->s, uap->name, uap->anamelen, uap->flags)); @@ -557,6 +562,10 @@ kern_socketpair(struct thread *td, int domain, int type, int protocol, type &= ~SOCK_CLOEXEC; oflag |= O_CLOEXEC; } + if ((type & SOCK_CLOFORK) != 0) { + type &= ~SOCK_CLOFORK; + oflag |= O_CLOFORK; + } if ((type & SOCK_NONBLOCK) != 0) { type &= ~SOCK_NONBLOCK; fflag |= FNONBLOCK; diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 5e7c554c34cf..8db981c9747c 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -111,10 +111,11 @@ typedef __uintptr_t uintptr_t; */ #define SOCK_CLOEXEC 0x10000000 #define SOCK_NONBLOCK 0x20000000 +#define SOCK_CLOFORK 0x40000000 #ifdef _KERNEL /* * Flags for accept1(), kern_accept4() and solisten_dequeue, in addition - * to SOCK_CLOEXEC and SOCK_NONBLOCK. + * to SOCK_CLOEXEC, SOCK_CLOFORK and SOCK_NONBLOCK. */ #define ACCEPT4_INHERIT 0x1 #define ACCEPT4_COMPAT 0x2