From nobody Sat Oct 01 14:45:02 2022 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 4MfqdB5bSZz4V4m3; Sat, 1 Oct 2022 14:45:02 +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 4MfqdB4gfNz3nPH; Sat, 1 Oct 2022 14:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664635502; 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=3FV521fAdqzifTuxe1+sF30LeL58aVu6Up+6CRpduXE=; b=bfEZCI48uS2/mGzKT4gr65gW5fEwgTCYDWJouulI6YVGMr5JERrXTA7nBWQbmBffnkaXtu ljXNTgD865wJlDcZ+4nEjBivAKhlF9hzA1T0mx0EURDQffJtE8vv4VxiHNvpVvZagw8ZhA MxMc7OIfT+NeGehhl5vDrusKnQBIGocdOGLkB14W480iTC/csCgk3qUfr8R/1oBtOrGGie q2ByHOt0tTq53OWvLIFHLB4XJeZqxA6bSf1OsGJyZVkwDC0AHkwNgM9E/WjIhKjs3oXmBV /bqc86idEqc+m60TuRbxenzJeU+8XCQWUf5LaAxqe723VwT+bwI0GoEshzfAUQ== 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 4MfqdB3n18zYqG; Sat, 1 Oct 2022 14:45:02 +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 291Ej2pc035712; Sat, 1 Oct 2022 14:45:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 291Ej2h1035711; Sat, 1 Oct 2022 14:45:02 GMT (envelope-from git) Date: Sat, 1 Oct 2022 14:45:02 GMT Message-Id: <202210011445.291Ej2h1035711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: bffb3d947b2e - main - nfs_clvnops.c: Fix access to v_mount when vnode unlocked 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bffb3d947b2ee48dc30c4876e0c7a5927375e38f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664635502; 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=3FV521fAdqzifTuxe1+sF30LeL58aVu6Up+6CRpduXE=; b=rGQnfkKzC1pfSrLaplMi3GXrzvZtSMJBU+NYf6BoDfmHc/Ar4jTgvfr06N1Nw2GNrx0Om+ wr2Pb8PxfFolcy9la9JIMASMqs68qY91IdoEg/+CTWNBXFlhHvRKJA07uTLse4YEozT5T8 eXzzhJxRMqG62fljBAicPJUJUyFu0m0gJDXRjVhWLWB2T26veLTCM2THe65Gxbfu+n1vqu 22XinZ/91WxLIjm5rE/kbgdbbuM1ZYURCGf1Cfu9CpNGOxpFiaIfDsiRXQJg3ydIKut8ul MiiThdV4P8swaYrguk2hix1tjHrJ3V6VVPK7IUsJwLlvGr3aRwFSkUpLLKynRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664635502; a=rsa-sha256; cv=none; b=ajxu6R/ecUd40f0wOVqem7OkZcKw8A2qGbZHM2kAuAkbLvOD2lSRuJCJIggHuTU3HBXduE aTRIkE9V1b7AJjiXzHcnEpru7nHBl6w1V8XHiCch3i5aUZoeiACMmb6R9JzhhgrqVbLRFq UKoGMM14lvsRl7zSFBNyhmysxnNqYSPYHY0yhQJS6SyqhqbcbyfK3QtU91hFdcJhGvR6u7 /DpnFFknjAZO8k+vG11ZQF8Hs7n2k83SzjeVdGPYB4YsUZ77qt60UgYpnr5Kcvf4Ia3qUO LbsXWtfCqaypFH/I1TWLKqLQCtcrb1PDkgQyqykfVGYP8E/OFynVEggNRzfi1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=bffb3d947b2ee48dc30c4876e0c7a5927375e38f commit bffb3d947b2ee48dc30c4876e0c7a5927375e38f Author: Rick Macklem AuthorDate: 2022-10-01 14:43:53 +0000 Commit: Rick Macklem CommitDate: 2022-10-01 14:43:53 +0000 nfs_clvnops.c: Fix access to v_mount when vnode unlocked Commit ab17854f974b fixed access to v_mount when the vnode is unlocked for nfs_copy_file_range(). This patch does the same for nfs_ioctl(). Reviewed by: kib, markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D36846 --- sys/fs/nfsclient/nfs_clvnops.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index f013b13b0cbe..686b69eaa637 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -4111,14 +4111,6 @@ nfs_ioctl(struct vop_ioctl_args *ap) int attrflag, content, error, ret; bool eof = false; /* shut up compiler. */ - if (vp->v_type != VREG) - return (ENOTTY); - nmp = VFSTONFS(vp->v_mount); - if (!NFSHASNFSV4(nmp) || nmp->nm_minorvers < NFSV42_MINORVERSION) { - error = vop_stdioctl(ap); - return (error); - } - /* Do the actual NFSv4.2 RPC. */ switch (ap->a_command) { case FIOSEEKDATA: @@ -4134,6 +4126,18 @@ nfs_ioctl(struct vop_ioctl_args *ap) error = vn_lock(vp, LK_SHARED); if (error != 0) return (EBADF); + + if (vp->v_type != VREG) { + VOP_UNLOCK(vp); + return (ENOTTY); + } + nmp = VFSTONFS(vp->v_mount); + if (!NFSHASNFSV4(nmp) || nmp->nm_minorvers < NFSV42_MINORVERSION) { + VOP_UNLOCK(vp); + error = vop_stdioctl(ap); + return (error); + } + attrflag = 0; if (*((off_t *)ap->a_data) >= VTONFS(vp)->n_size) error = ENXIO;