From owner-svn-src-head@freebsd.org Tue Sep 3 12:54:52 2019 Return-Path: Delivered-To: svn-src-head@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 2C59CDA165; Tue, 3 Sep 2019 12:54:52 +0000 (UTC) (envelope-from mjg@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) server-signature RSA-PSS (4096 bits) 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 46N6Nr0Bbzz4KF7; Tue, 3 Sep 2019 12:54:52 +0000 (UTC) (envelope-from mjg@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 D96092F99; Tue, 3 Sep 2019 12:54:51 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x83Csp0e012434; Tue, 3 Sep 2019 12:54:51 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x83Csp8c012433; Tue, 3 Sep 2019 12:54:51 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201909031254.x83Csp8c012433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 3 Sep 2019 12:54:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351741 - head/sys/fs/pseudofs X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/fs/pseudofs X-SVN-Commit-Revision: 351741 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Sep 2019 12:54:52 -0000 Author: mjg Date: Tue Sep 3 12:54:51 2019 New Revision: 351741 URL: https://svnweb.freebsd.org/changeset/base/351741 Log: pseudofs: fix a LOR pfs_node vs pidhash (sleepable after non-sleepable) Sponsored by: The FreeBSD Foundation Modified: head/sys/fs/pseudofs/pseudofs_vnops.c Modified: head/sys/fs/pseudofs/pseudofs_vnops.c ============================================================================== --- head/sys/fs/pseudofs/pseudofs_vnops.c Tue Sep 3 12:40:58 2019 (r351740) +++ head/sys/fs/pseudofs/pseudofs_vnops.c Tue Sep 3 12:54:51 2019 (r351741) @@ -132,6 +132,24 @@ pfs_visible(struct thread *td, struct pfs_node *pn, pi PFS_RETURN (0); } +static int +pfs_lookup_proc(pid_t pid, struct proc **p) +{ + struct proc *proc; + + proc = pfind(pid); + if (proc == NULL) + return (0); + if ((proc->p_flag & P_WEXIT) != 0) { + PROC_UNLOCK(proc); + return (0); + } + _PHOLD(proc); + PROC_UNLOCK(proc); + *p = proc; + return (1); +} + /* * Verify permissions */ @@ -791,11 +809,17 @@ pfs_readdir(struct vop_readdir_args *va) if (resid == 0) PFS_RETURN (0); + if (!pfs_lookup_proc(pid, &proc)) + PFS_RETURN (ENOENT); + sx_slock(&allproc_lock); pfs_lock(pd); + PROC_LOCK(proc); /* check if the directory is visible to the caller */ - if (!pfs_visible(curthread, pd, pid, &proc)) { + if (!pfs_visible_proc(curthread, pd, proc)) { + _PRELE(proc); + PROC_UNLOCK(proc); sx_sunlock(&allproc_lock); pfs_unlock(pd); PFS_RETURN (ENOENT); @@ -807,8 +831,10 @@ pfs_readdir(struct vop_readdir_args *va) for (pn = NULL, p = NULL; offset > 0; offset -= PFS_DELEN) { if (pfs_iterate(curthread, proc, pd, &pn, &p) == -1) { /* nothing left... */ - if (proc != NULL) + if (proc != NULL) { + _PRELE(proc); PROC_UNLOCK(proc); + } pfs_unlock(pd); sx_sunlock(&allproc_lock); PFS_RETURN (0); @@ -859,8 +885,10 @@ pfs_readdir(struct vop_readdir_args *va) offset += PFS_DELEN; resid -= PFS_DELEN; } - if (proc != NULL) + if (proc != NULL) { + _PRELE(proc); PROC_UNLOCK(proc); + } pfs_unlock(pd); sx_sunlock(&allproc_lock); i = 0;