From owner-svn-src-all@freebsd.org Wed Nov 25 17:12:22 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 0B57F46F3FC; Wed, 25 Nov 2020 17:12:22 +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 4Ch6rj70zjz3mLX; Wed, 25 Nov 2020 17:12:21 +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 D953114A74; Wed, 25 Nov 2020 17:12:21 +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 0APHCLa9002787; Wed, 25 Nov 2020 17:12:21 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0APHCL8m002762; Wed, 25 Nov 2020 17:12:21 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202011251712.0APHCL8m002762@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 25 Nov 2020 17:12:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368024 - head/sys/ufs/ffs X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/ufs/ffs X-SVN-Commit-Revision: 368024 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: Wed, 25 Nov 2020 17:12:22 -0000 Author: kib Date: Wed Nov 25 17:12:21 2020 New Revision: 368024 URL: https://svnweb.freebsd.org/changeset/base/368024 Log: ffs_softdep.c: get_parent_vp(): Fix bp lock leak when inum inode was already freed. Reported by: markj, pho Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/ufs/ffs/ffs_softdep.c Modified: head/sys/ufs/ffs/ffs_softdep.c ============================================================================== --- head/sys/ufs/ffs/ffs_softdep.c Wed Nov 25 17:04:26 2020 (r368023) +++ head/sys/ufs/ffs/ffs_softdep.c Wed Nov 25 17:12:21 2020 (r368024) @@ -1409,6 +1409,29 @@ SYSCTL_INT(_debug_softdep, OID_AUTO, print_threads, CT /* List of all filesystems mounted with soft updates */ static TAILQ_HEAD(, mount_softdeps) softdepmounts; +static void +get_parent_vp_unlock_bp(struct mount *mp, struct buf *bp, + struct diraddhd *diraddhdp, struct diraddhd *unfinishedp) +{ + struct diradd *dap; + + /* + * Requeue unfinished dependencies before + * unlocking buffer, which could make + * diraddhdp invalid. + */ + ACQUIRE_LOCK(VFSTOUFS(mp)); + while ((dap = LIST_FIRST(unfinishedp)) != NULL) { + LIST_REMOVE(dap, da_pdlist); + LIST_INSERT_HEAD(diraddhdp, dap, da_pdlist); + } + FREE_LOCK(VFSTOUFS(mp)); + + bp->b_vflags &= ~BV_SCANNED; + BUF_NOREC(bp); + BUF_UNLOCK(bp); +} + /* * This function fetches inode inum on mount point mp. We already * hold a locked vnode vp, and might have a locked buffer bp belonging @@ -1439,7 +1462,6 @@ get_parent_vp(struct vnode *vp, struct mount *mp, ino_ struct vnode **rvp) { struct vnode *pvp; - struct diradd *dap; int error; bool bplocked; @@ -1455,31 +1477,18 @@ get_parent_vp(struct vnode *vp, struct mount *mp, ino_ * restart the syscall. */ if (VTOI(pvp)->i_mode == 0 || !bplocked) { + if (bp != NULL && bplocked) + get_parent_vp_unlock_bp(mp, bp, + diraddhdp, unfinishedp); if (VTOI(pvp)->i_mode == 0) vgone(pvp); - vput(pvp); error = ERELOOKUP; - goto out; + goto out2; } - - error = 0; goto out1; } if (bp != NULL && bplocked) { - /* - * Requeue unfinished dependencies before - * unlocking buffer, which could make - * diraddhdp invalid. - */ - ACQUIRE_LOCK(VFSTOUFS(mp)); - while ((dap = LIST_FIRST(unfinishedp)) != NULL) { - LIST_REMOVE(dap, da_pdlist); - LIST_INSERT_HEAD(diraddhdp, dap, da_pdlist); - } - FREE_LOCK(VFSTOUFS(mp)); - bp->b_vflags &= ~BV_SCANNED; - BUF_NOREC(bp); - BUF_UNLOCK(bp); + get_parent_vp_unlock_bp(mp, bp, diraddhdp, unfinishedp); bplocked = false; } @@ -1528,13 +1537,13 @@ get_parent_vp(struct vnode *vp, struct mount *mp, ino_ MPASS(!bplocked); error = ERELOOKUP; } +out2: if (error != 0 && pvp != NULL) { vput(pvp); pvp = NULL; } out1: *rvp = pvp; -out: ASSERT_VOP_ELOCKED(vp, "child vnode must be locked on return"); return (error); }