From nobody Thu Dec 18 18:22:53 2025 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 4dXJtk1x0Hz6LTgT for ; Thu, 18 Dec 2025 18:22: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXJtj6nCCz46rk for ; Thu, 18 Dec 2025 18:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766082174; 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=4j/VishZPnI2XgKHgLmXVxD7Jm9uHLIOVvm2tD5gh0U=; b=D6fTOiIDC+p8v7yRbOdDd71sccw1/xCjWfGrjSkdxfr2CSTC1dx6Z8Voj3R4ithxPmQARi VKSzF05DnumKVd6nrvO0gUo5MBKjb769aHPxzZFseINsYInh5Hrs/203PheCX8fcd34ZeE PGEappXhdTEcP+19Re3WIObh/Ll1GpJa1y+68XC4PLrZhqr4x+Ja3bQLTYWV52KJnrHWx0 Xas5qp+sTMZ6jlTiiJt3cI7IWZAEZboGGE5vGj0fJm9VBqRwJXScVLcbfeEV054pMK5yP0 HP0r5NizAs0LpwrIMpRLr5j2C8c6M4NwfRdo0M1VRlFh3M5A16FnOJHEL+6RUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766082174; 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=4j/VishZPnI2XgKHgLmXVxD7Jm9uHLIOVvm2tD5gh0U=; b=rxmvrNqrA4IqGU64KrOOqYZseI5jRbWt/E9Ug94zakTgkxTHJOjVKUtNFEo5sNJQh5CTiw wP/T5T0d1Bs+Ji4Htm55kTCn62m6KMSZ+xaduSS2ajAIvSiF5BPwOshwoBh/oddi/26GWn SIkIqNMrB0vIH30AWXL8VIJxCX4x1Knh96EICxBrgjxNy8UApRSDfIJRW+Y5d2O7JTDDvZ jtnOr1kcpRQAKSMP6Wg/botVsH4z1WNLeW7FnVLIFQrnI8gBeoTYjCPmL67r43I9HyW7KR C19p4QsHRugjH44KXId8K6sPf1ve8dDILWOhU7p8Pnt1upHc3D6l0VlmSm7kZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766082174; a=rsa-sha256; cv=none; b=Ah9oVgbhSODyhIsltYS0pQyHPc+8vziGFvuK12DotaeBBt/JdNGqBgWG4DpGwA7X/vnlZF rtRU7K8e1Tiy0+nYfqYRiyCmuTE2yQibhrpuiSt3cDJiTMdT3jHkY7+tmhNEWfKMxAZ7tf HqSJrCvW4eukSOCbi8iMNwv4CC8n7kA8E2W3ns02kmrlDk+1Z/usn9SdSr/EdbRlLszZ0X FckjbIrLR+O5puYOOCtOhgoNdpate6aXSNyVFcuiBsfD+QZAcDe+APHUwvnRg1xfMuuDrF hrntRfTfXLHfM+A77bLuuJMkr3pIJp2DjwTa3txXCd4qcJJBs7n+ReW+4C9pBA== 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 4dXJtj6LTTzpmj for ; Thu, 18 Dec 2025 18:22:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26cb8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 18:22:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: John Baldwin Subject: git: 11870bb24801 - stable/15 - fcntl(F_SETFL): only allow one thread to perform F_SETFL 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 11870bb24801b053e04753b72d00297e2cf31fb9 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 18:22:53 +0000 Message-Id: <6944467d.26cb8.6216622c@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=11870bb24801b053e04753b72d00297e2cf31fb9 commit 11870bb24801b053e04753b72d00297e2cf31fb9 Author: Konstantin Belousov AuthorDate: 2025-09-11 10:05:04 +0000 Commit: John Baldwin CommitDate: 2025-12-18 17:01:55 +0000 fcntl(F_SETFL): only allow one thread to perform F_SETFL Use f_vflags file locking for this. Allowing more than one thread handling F_SETFL might cause de-sync between real driver state and flags. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D52487 (cherry picked from commit 4c3a868d13c053ef173268cdfe1365978a282178) --- sys/kern/kern_descrip.c | 3 +++ sys/kern/vfs_vnops.c | 36 ++++++++++++++++++++++++++++++++++++ sys/sys/file.h | 4 ++++ 3 files changed, 43 insertions(+) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 2e43b5ca3b97..2fa0621bdfca 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -657,6 +657,7 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) error = EBADF; break; } + fsetfl_lock(fp); do { tmp = flg = fp->f_flag; tmp &= ~FCNTLFLAGS; @@ -676,6 +677,7 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) if (error != 0) goto revert_nonblock; } + fsetfl_unlock(fp); fdrop(fp, td); break; revert_nonblock: @@ -690,6 +692,7 @@ revert_flags: tmp |= got_cleared; tmp &= ~got_set; } while (atomic_cmpset_int(&fp->f_flag, flg, tmp) == 0); + fsetfl_unlock(fp); fdrop(fp, td); break; diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index e27692ccb1a3..68c0ea952e11 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -902,6 +902,18 @@ foffset_read(struct file *fp) return (atomic_load_long(&fp->f_offset)); } +void +fsetfl_lock(struct file *fp) +{ + file_v_lock(fp, FILE_V_SETFL_LOCKED, FILE_V_SETFL_LOCK_WAITING); +} + +void +fsetfl_unlock(struct file *fp) +{ + file_v_unlock(fp, FILE_V_SETFL_LOCKED, FILE_V_SETFL_LOCK_WAITING); +} + #else /* OFF_MAX <= LONG_MAX */ static void @@ -977,6 +989,30 @@ foffset_read(struct file *fp) return (foffset_lock(fp, FOF_NOLOCK)); } + +void +fsetfl_lock(struct file *fp) +{ + struct mtx *mtxp; + + mtxp = mtx_pool_find(mtxpool_sleep, fp); + mtx_lock(mtxp); + file_v_lock_mtxp(fp, mtxp, FILE_V_SETFL_LOCKED, + FILE_V_SETFL_LOCK_WAITING); + mtx_unlock(mtxp); +} + +void +fsetfl_unlock(struct file *fp) +{ + struct mtx *mtxp; + + mtxp = mtx_pool_find(mtxpool_sleep, fp); + mtx_lock(mtxp); + file_v_unlock_mtxp(fp, mtxp, FILE_V_SETFL_LOCKED, + FILE_V_SETFL_LOCK_WAITING); + mtx_unlock(mtxp); +} #endif void diff --git a/sys/sys/file.h b/sys/sys/file.h index b537daa27ff5..8105d658185e 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -93,6 +93,8 @@ void foffset_lock_pair(struct file *fp1, off_t *off1p, struct file *fp2, void foffset_lock_uio(struct file *fp, struct uio *uio, int flags); void foffset_unlock(struct file *fp, off_t val, int flags); void foffset_unlock_uio(struct file *fp, struct uio *uio, int flags); +void fsetfl_lock(struct file *fp); +void fsetfl_unlock(struct file *fp); static inline off_t foffset_get(struct file *fp) @@ -228,6 +230,8 @@ struct file { #define FILE_V_FOFFSET_LOCKED 0x0001 #define FILE_V_FOFFSET_LOCK_WAITING 0x0002 +#define FILE_V_SETFL_LOCKED 0x0004 +#define FILE_V_SETFL_LOCK_WAITING 0x0008 #endif /* __BSD_VISIBLE */ #endif /* _KERNEL || _WANT_FILE */