From nobody Mon Apr 24 22:39:31 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 4Q50S32qN5z45xsH; Mon, 24 Apr 2023 22:39:31 +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 4Q50S32P3Sz3y4D; Mon, 24 Apr 2023 22:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682375971; 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=3i/Fst6pxotdirKcrIowbkr+ywDfWdwmhNe+0yBTCEE=; b=W5Twhh3JlGDsTK69tRH1u+krOEtG45eEy5E2CNKL/ZIDIcv4TWoXxBWjrPxazGhtHjCVih IQYcBNL4wfBKFD8/Ftl+5HyPmXhFRndSuDT6DWwSC9KKtw/rMhxiHYvdcMWO81sLYDYXGA jF1y7wTzmcmNaKJbn7km3whF6+qO8MzMPsvR7PEyI/BiGu5N3VfLqLojPReebqVhweMYW1 TiiMRe9QOMytxaWCxW6AZb0hm/chD8VJz2a2aUSUgd+tLwGHgjKchu7wf3kY3xoGU9OBOQ BpWrCjgHc56COfGzDVmu077yrm9h2Il5R/CfkpViOxltHktRsqAW8M7iNvJzGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682375971; 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=3i/Fst6pxotdirKcrIowbkr+ywDfWdwmhNe+0yBTCEE=; b=QyucAoLy9jV6BdubZzn3x542IofIaK5pteWRhD1Lw5hKeeQHJSCuDw85GJxJUSmjGQHaF9 DBj6byc6/Uq7g8w75HzPev66e5eaK1KUn3uLoQ7tyWyHmgz0I2Kehp7LYBYbQJqswKiZVD 9BnexzdJ3av6kNDFg4lorO9ZwdDwCmtNPGHag4Wrbe/9eSWjs0wWIANfolUNqxhLpsh3Vy LZfTDEpdNm8mFIWvOAXRzmXyGLs6MsjI21VoIu6JwVMXu+eOyP7/XWmen93SUMEk/tCYSt yeYzC9Bf/BLkvflPucqfxcq5V6VBYLskmrbT2gvmHUv4rjO3gIHtqoR/hakezw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682375971; a=rsa-sha256; cv=none; b=wvcb5Du+ezf0oNeOAmf2xnjSABfcvKZ7Icd+JKFueH81LV/v/ThQbgdjtGu9/b9FGjRmMi a9nIXV/swJfgLR7fKCmoiL+Z9k6Y+L4tlWY3jBpwSPaAAvBTkl6ZFmn5gGm6ITiXH2q6Wr tUEg2VYt/Rc37nBjdIqrlqJKcWhDFEMNeS/x0vSOjnUQ86+gVMdBtSP7ygPMdJw1dO29NW 1ECeXSHZfRoxTzmKp4+TG1TsJ0cl4zlqa1cWz2ZZzdRrRlWgP/XmxOaP0zO6rYmSFIQkNU qcShYGPGUlZ6WcbZJtlLbro6kE1TKC8zTdDRMX1Yux1aNKlRMB3gid3lSetKmQ== 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 4Q50S31S3QzjMv; Mon, 24 Apr 2023 22:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33OMdVug059916; Mon, 24 Apr 2023 22:39:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OMdVK6059915; Mon, 24 Apr 2023 22:39:31 GMT (envelope-from git) Date: Mon, 24 Apr 2023 22:39:31 GMT Message-Id: <202304242239.33OMdVK6059915@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: 6a5e61401502 - main - vn_open_vnode(): fix locking around VOP_CLOSE() on advisory lock 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a5e61401502288ec10629beb28be048c1cce34a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a5e61401502288ec10629beb28be048c1cce34a commit 6a5e61401502288ec10629beb28be048c1cce34a Author: Olivier Certner AuthorDate: 2023-04-24 09:36:09 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-24 22:37:58 +0000 vn_open_vnode(): fix locking around VOP_CLOSE() on advisory lock error In the case of a FIFO or if trying to open a file for writing, an exclusive lock is necessary. Reviewed by: kib MFC after: 1 week --- sys/kern/vfs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 52242cce0692..e42d17ec2478 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -483,8 +483,8 @@ vn_open_vnode(struct vnode *vp, int fmode, struct ucred *cred, * If there is no fp, due to kernel-mode open, * we can call VOP_CLOSE() now. */ - if (vp->v_type != VFIFO && (fmode & FWRITE) != 0 && - !MNT_EXTENDED_SHARED(vp->v_mount) && + if ((vp->v_type == VFIFO || (fmode & FWRITE) != 0 || + !MNT_EXTENDED_SHARED(vp->v_mount)) && VOP_ISLOCKED(vp) != LK_EXCLUSIVE) vn_lock(vp, LK_UPGRADE | LK_RETRY); (void)VOP_CLOSE(vp, fmode & (FREAD | FWRITE | FEXEC),