From nobody Sat Sep 20 19:34:28 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 4cTfhN4gZ3z68JbP; Sat, 20 Sep 2025 19:34:28 +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 4cTfhN2v0bz3Chh; Sat, 20 Sep 2025 19:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758396868; 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=joCHUwCHlpRAm3FXzZfGAyTvPnAwjNgsZWF/FB7j38Y=; b=ZgdbKAym6YrgHCCgEsIQ50sPwM7w7XXqZBJRbtZn3h9MHDxO0snzipSG/l4gqczmg1narH 9lUY7g0nCMKNNux2CZ2L29rhcZzX9YK5JMa+g5TtwYWPdYe2Oa8glVRjy5I6AvfT2KUgBe Buyv21VBuV7UP9HHm3YrpFVlWwW8OJsW+oO1e9vl70uN6zJSEuseUsG/3FKD5ICep4ZiPE KY8Rz5GIFF77Mj0idlpOJ+DKQ1bk8Yyf4Up2gE1iIAn2oDf8+JdpziTGo2r932WyXUe0DQ KUCwqikAevmuRU7XwAArR9qkqUdl8ae/S15JTJ+3uPjyzgHY7XT+OKyfbNcHBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758396868; 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=joCHUwCHlpRAm3FXzZfGAyTvPnAwjNgsZWF/FB7j38Y=; b=vDbKXux8Pzr6nGipqyMNILgpaqQun0BE0YysDF+bCvgR2aDoOuZgWsdxZhgIwX8yJPUuuv kqwaafMMQBjVsv/rKZhBgxf4MrXJrvliBuCuAJpG/+0uIpKsNQWUiRrpAA5ecbyrZofcuG Cgyp7KeiBqO10JCIoK6EE7HMzG9j092mrFj9Bbb/Nn5hegOSsVXlISs0wzld+WT0+JWGaj KPjcJmXKx2BDbzdxwBihHERv7P3KtDCVJG9hiKYUkQllt5G3WfZ4o5yPrBxYfOUykFcWO4 vVBRy6c4RX3uc4bkBj8nmTxGKXw4V9dPnSIqpDRS3kZrAm5BcUzbLnurK1HN3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758396868; a=rsa-sha256; cv=none; b=Y7LRm9wRUjp3Z6ci/I0A7y+v6CHobG9Emd5Rnk2KxoTSrQhvaH5+xuLi9O+CobvdxkaSoN WCrtI41RBw79+c5g14aA2ewpQ4Eo2V3E7+QrtTQrlD8hHE97QUeZM0HgRr7kSIA86p2RWl 2YMOIk9pO/QeLaQZcxT9Bc+mLuhTz9qOkxH8Wzi2N73OvhTXAkjmBi4Bq7yQKabEROkiun ZGU290sPITWNIFfG7k9U5cuti5AFWdmMXBrzssZE/1Z1sgJzhECmT7dEFIWAZ8NVYdONFm ot1RB9eQuU52+IfuBppPj5kNWfaMiDVMP8e5Y1SvqXSmgdVUUlXAAI/y02q69g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cTfhN2Js0zhNW; Sat, 20 Sep 2025 19:34:28 +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 58KJYS5n040348; Sat, 20 Sep 2025 19:34:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58KJYSEN040345; Sat, 20 Sep 2025 19:34:28 GMT (envelope-from git) Date: Sat, 20 Sep 2025 19:34:28 GMT Message-Id: <202509201934.58KJYSEN040345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4c3a868d13c0 - main - fcntl(F_SETFL): only allow one thread to perform F_SETFL 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c3a868d13c053ef173268cdfe1365978a282178 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4c3a868d13c053ef173268cdfe1365978a282178 commit 4c3a868d13c053ef173268cdfe1365978a282178 Author: Konstantin Belousov AuthorDate: 2025-09-11 10:05:04 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-20 19:24:10 +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 --- 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 2a833d2eafbe..19118eb7f275 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -658,6 +658,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; @@ -677,6 +678,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: @@ -691,6 +693,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 f81c2033d95e..3d4567b6ab1e 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -896,6 +896,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 @@ -971,6 +983,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 9a072121e25f..c44fd0f28929 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) @@ -222,6 +224,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 */