From nobody Thu Sep 21 00:59:36 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 4RrcVx0qWBz4vQ6Z; Thu, 21 Sep 2023 00:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrcVx0630z4mYq; Thu, 21 Sep 2023 00:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695257977; 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=UjDQPOXjlgJVQd40zumDTZimFhiO+xNQZzPO95esN7Y=; b=KUREsmk3Vwi0IVcW+kCgNUBlaLKqmPCF2fzBC6e7iRvHLqroQyx2ttKTeFlW/gqTPtEoYi qwxFNM5IHIk5dSIXJLqYc9LPfDRFPxSigCdHMRa05gQpQ/b4wfPKR9xlqQuWFAaw1iTe1q 5AL4Wy9Ppribjzs6eiRN8gyXIpSIgiT93eOdnnHbddoWrxEr95EPYY1zvU3QkU7Zq3TeqQ dDjyebyqre2PNNXNWq/FpicLJM8bV4XfVSGkEHQ3heyJa/xCjF8j6hd3c0geCg9vEKLRen QzzLW8v7mlYSRgFxIl4QWJzauk1f2Kr/FvQA1IGctzrcnhoTpWx14kqw9xcOow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695257977; a=rsa-sha256; cv=none; b=YHL2NUuLiQ3YRSNSrZ1Zp2n1MJR8c8VNSfFCOzC+hw0FGNskumH2/o/BoPfVcme/kLWgU6 zjt4ShIonRHvlzbQBi53EI/EeCD4WkR9h1bkqExy19A+y45ElZwOb+svl0iSwMVuxZoyiC bEO73HgMXyFcdT/vt+ADCCFqdKB6awiJbzD5sV+00b3aMvzruGKygmwTVyWIGgb2A5Ynx0 Onod7rzLzEe3r3ylYk8kG+Z6xR7EEv2rCqGaLMZHeu6V/b+ZUnm2TAGhYFVdqg7o4BeMlW U5VZcmKL2BPtaj+f7ux6F4nIIut3nosjwULpIp/Iihgpg0Jssuhg35oFkOSEKA== 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=1695257977; 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=UjDQPOXjlgJVQd40zumDTZimFhiO+xNQZzPO95esN7Y=; b=Ym7PA8cn6GZXoU8AmNb/NpWvB8lsEHecdvvrQoJKvAD0X4XLqVSgw/5jugtw9F5g+EVW8n 6OPSEVCDRulMvv7dUiGyF3M+9xemfyECsJFNn20McAlpyJCZ+UdfLIJxO8Z1/xK47WbCqO /J1FAC/wuChbDLHByTIidIsdmX5rfu9c6rH9OHMgNfsDJIBKt1j9gbSS02QA9/kMKO5gIY lQmgFEZPaVLRNS1UXotLTrSIcuB96sHCzQwd6fr3tJATqf7YozfAJ43b3ASyC3yLPlU2c3 JldhU8b4b842NiDj6zTjKGjZxYFrcjYlJoOhJ/g2Xcn4eoNahujd9PJTM08Ehw== 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 4RrcVw6HWYz3X8; Thu, 21 Sep 2023 00:59:36 +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 38L0xaVi044100; Thu, 21 Sep 2023 00:59:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38L0xadA044097; Thu, 21 Sep 2023 00:59:36 GMT (envelope-from git) Date: Thu, 21 Sep 2023 00:59:36 GMT Message-Id: <202309210059.38L0xadA044097@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: c584bb9cac16 - main - vfs_remount_ro(): mnt_lockref should be only accessed after vfs_op_enter() 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: c584bb9cac16bc200ac45cc8b709e7e7e99e24bb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c584bb9cac16bc200ac45cc8b709e7e7e99e24bb commit c584bb9cac16bc200ac45cc8b709e7e7e99e24bb Author: Konstantin Belousov AuthorDate: 2023-09-20 03:42:31 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-21 00:59:11 +0000 vfs_remount_ro(): mnt_lockref should be only accessed after vfs_op_enter() PR: 273953 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/vfs_mount.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 45ab9cfc93cc..8364081585f8 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -3004,6 +3004,7 @@ vfs_remount_ro(struct mount *mp) struct vnode *vp_covered, *rootvp; int error; + vfs_op_enter(mp); KASSERT(mp->mnt_lockref > 0, ("vfs_remount_ro: mp %p is not busied", mp)); KASSERT((mp->mnt_kern_flag & MNTK_UNMOUNT) == 0, @@ -3012,17 +3013,19 @@ vfs_remount_ro(struct mount *mp) rootvp = NULL; vp_covered = mp->mnt_vnodecovered; error = vget(vp_covered, LK_EXCLUSIVE | LK_NOWAIT); - if (error != 0) + if (error != 0) { + vfs_op_exit(mp); return (error); + } VI_LOCK(vp_covered); if ((vp_covered->v_iflag & VI_MOUNT) != 0) { VI_UNLOCK(vp_covered); vput(vp_covered); + vfs_op_exit(mp); return (EBUSY); } vp_covered->v_iflag |= VI_MOUNT; VI_UNLOCK(vp_covered); - vfs_op_enter(mp); vn_seqc_write_begin(vp_covered); MNT_ILOCK(mp);