From nobody Wed Sep 06 20:46:15 2023 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 4RgvY36br8z4srxn; Wed, 6 Sep 2023 20:46:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgvY368t1z3Bs7; Wed, 6 Sep 2023 20:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033175; 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=7ZZHk/cD28fKlJJs2EsN36tWhUNcA4QA90qDRPKME/c=; b=F7s+T0D4cgEAMWg710tMS8aaVHefoOggznnHqo/Nx7QCBJVRUvOJqHU942XnRy+2pZ90W8 gkMnfbscm+JlByp9Uoiv3yJB89HDLtp960+945xBm+n7JwfC0gH15hzR//n6lxNiBavFoo dUXadJw9XHIDjMiPrvBTCAgW2jnx5EsY/YhEwQfTkZXvUWDX8nXzFkMbRjLvJA0wYVaEC2 kesgsPIM1EjOf9lm1qKz38j5wVeWaAz0HOzE7mCtpnGwVskdXN3v5qoLY4ZhojbRuN2by/ yDEMVmT+tBQBEZcY1hkDjOsPMxyMGR1epLehCsDSLDGwSgIgWSdinm41fiUIJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694033175; a=rsa-sha256; cv=none; b=DBD1L/8v0AbcFX/FR2YK3qZk4hbDeagdtn1WFGQcYu6nFLVOOKQCnN3gKr9ZqiPyOVQoJ4 N4mLCq/vBy4H0aSWC0e9/7LXgi2ndU/sCyptqisWT43Anxg+3gjic6uP/rZh1aKTuu/pI8 Nrj2+gM2p5Jqyu5Li8NM8iCGsnirtDVMNvPd2EZzgG42SdwJO2SGM4UkEJPI4wwKMHj6yZ FvO9Z61vlnIusW/RlB3dmZ/bsA5VpB8viKmfmwaOPShpWGxFzh/0m2pFAqwizBKPtTdnA0 sr4Ab1inRuiNfIjQI9nMkK17hXJop/Cq9+nswBULjSN0M8KVuEbyUyAPHThNDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033175; 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=7ZZHk/cD28fKlJJs2EsN36tWhUNcA4QA90qDRPKME/c=; b=g6GbwYeQhIYUGZQx3VlKtLN9bCMRd6seCr22AXXzxvOW34h6vVwrETyK+XYvaTk+mRZrVI fKmvIzNMHKNyEyJQiyDAt+PlGCvLU30ZV2GsV4YHUe4QKduXiccW8bFH+MA49k5NoTbNk3 g9hdI4thNvLkG7Vi3AUTZIXsH6wroTtszL+fETgN2EEsbPPyCWXEhFGSsIeARiDl+Nv1BQ 6pG6DvRoblCxSqVndzaXCB/pgphTTB+s8+sK08FIDkZ/nCXrTgAvLASkfnFv29xaEBkvyf hsV2aGh0im4s9QRcebuGHGmuY4VnEuYa9+Pfbk9lyVVvIoAmPP/zFMzhDDc/cA== 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 4RgvY359jmzX48; Wed, 6 Sep 2023 20:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386KkFH4002934; Wed, 6 Sep 2023 20:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386KkFsI002931; Wed, 6 Sep 2023 20:46:15 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:46:15 GMT Message-Id: <202309062046.386KkFsI002931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 14ca2bc402bb - stable/13 - During F_SETFL, don't change file flags on error 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14ca2bc402bb82fb59a9aede05f62cb5e634b710 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=14ca2bc402bb82fb59a9aede05f62cb5e634b710 commit 14ca2bc402bb82fb59a9aede05f62cb5e634b710 Author: Alan Somers AuthorDate: 2023-07-09 20:48:10 +0000 Commit: Alan Somers CommitDate: 2023-09-06 20:45:11 +0000 During F_SETFL, don't change file flags on error Previously, even if the FIONBIO or FIOASYNC ioctl failed, the file's f_flags variable would still be changed. Now, kern_fcntl will restore the original flags if the ioctl fails. PR: 265736 Reported by: Yuval Pavel Zholkover Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40955 (cherry picked from commit 6c049996ec29bad4a913b019a28f211ab84b0d3d) --- sys/kern/kern_descrip.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index ab08ca434dec..dbf4ab1828de 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -481,7 +481,7 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) struct vnode *vp; struct mount *mp; struct kinfo_file *kif; - int error, flg, kif_sz, seals, tmp; + int error, flg, kif_sz, seals, tmp, got_set, got_cleared; uint64_t bsize; off_t foffset; @@ -559,12 +559,12 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) tmp &= ~FCNTLFLAGS; tmp |= FFLAGS(arg & ~O_ACCMODE) & FCNTLFLAGS; } while (atomic_cmpset_int(&fp->f_flag, flg, tmp) == 0); + got_set = tmp & ~flg; + got_cleared = flg & ~tmp; tmp = fp->f_flag & FNONBLOCK; error = fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); - if (error != 0) { - fdrop(fp, td); - break; - } + if (error != 0) + goto revert_f_setfl; tmp = fp->f_flag & FASYNC; error = fo_ioctl(fp, FIOASYNC, &tmp, td->td_ucred, td); if (error == 0) { @@ -574,6 +574,13 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) atomic_clear_int(&fp->f_flag, FNONBLOCK); tmp = 0; (void)fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); +revert_f_setfl: + do { + tmp = flg = fp->f_flag; + tmp &= ~FCNTLFLAGS; + tmp |= got_cleared; + tmp &= ~got_set; + } while (atomic_cmpset_int(&fp->f_flag, flg, tmp) == 0); fdrop(fp, td); break;