From owner-svn-src-all@freebsd.org Sun Dec 6 18:09:15 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B5714A4E94; Sun, 6 Dec 2020 18:09:15 +0000 (UTC) (envelope-from kib@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CpvbG6t3Rz4cwF; Sun, 6 Dec 2020 18:09:14 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF4EE14063; Sun, 6 Dec 2020 18:09:14 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B6I9Eo2057273; Sun, 6 Dec 2020 18:09:14 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B6I9Ep8057271; Sun, 6 Dec 2020 18:09:14 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202012061809.0B6I9Ep8057271@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 6 Dec 2020 18:09:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368393 - head/sys/ufs/ufs X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/ufs/ufs X-SVN-Commit-Revision: 368393 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2020 18:09:15 -0000 Author: kib Date: Sun Dec 6 18:09:14 2020 New Revision: 368393 URL: https://svnweb.freebsd.org/changeset/base/368393 Log: ufs: handle two more cases of possible VNON vnode returned from VFS_VGET(). Reported by: kevans Reviewed by: mckusick, mjg Tested by: pho Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D27457 Modified: head/sys/ufs/ufs/ufs_lookup.c head/sys/ufs/ufs/ufs_vfsops.c Modified: head/sys/ufs/ufs/ufs_lookup.c ============================================================================== --- head/sys/ufs/ufs/ufs_lookup.c Sun Dec 6 17:45:42 2020 (r368392) +++ head/sys/ufs/ufs/ufs_lookup.c Sun Dec 6 18:09:14 2020 (r368393) @@ -745,6 +745,11 @@ found: *vpp = vdp; } else { error = VFS_VGET(pdp->v_mount, ino, cnp->cn_lkflags, &tdp); + if (error == 0 && VTOI(tdp)->i_mode == 0) { + vgone(tdp); + vput(tdp); + error = ENOENT; + } if (error) return (error); *vpp = tdp; Modified: head/sys/ufs/ufs/ufs_vfsops.c ============================================================================== --- head/sys/ufs/ufs/ufs_vfsops.c Sun Dec 6 17:45:42 2020 (r368392) +++ head/sys/ufs/ufs/ufs_vfsops.c Sun Dec 6 18:09:14 2020 (r368393) @@ -240,6 +240,8 @@ ufs_fhtovp(mp, ufhp, flags, vpp) ip = VTOI(nvp); if (ip->i_mode == 0 || ip->i_gen != ufhp->ufid_gen || ip->i_effnlink <= 0) { + if (ip->i_mode == 0) + vgone(nvp); vput(nvp); *vpp = NULLVP; return (ESTALE);