From nobody Fri Sep 22 20:59:27 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 4Rsl4v5WPHz4vPMX; Fri, 22 Sep 2023 20:59:27 +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 4Rsl4v52KXz3Knw; Fri, 22 Sep 2023 20:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695416367; 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=MYL7R1Ico7AWa+D1FgzAp89Kwey4qNeGGFbfho9kcA8=; b=nXfMhVS9qEyYLvxqgDpfG2VEqRJnezGKS8NOlIhPeAtDQVsq8DdMaM3jhQFG6i15dZvlHJ 2oKqaQmO9DUfzV09MfmSxTO95ykORn1xdiGnHlebxLFERi9sbLg1+YMawwftJeOa5AOJcq uJweEycI7i82xHjestuqt70nZ8b1e64OkApmhgnGyaQB04UI2N1oeeDqBZjeN9v91VK1lJ XHUcJXhrD2yPpR4LVIX4XGg3N0MVdfrYL0j4jSoNdePZwHF1FxCYY9bY9mS+sFQ54SF9fX mIEcfPb+AUYcnAb9ea2s0w9OzpGrel1V+PGW8FpKOt/DRadLQJfK9gn58J3b6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695416367; a=rsa-sha256; cv=none; b=kkZFLYPq63MuIjEwdoj4cgrfY/Ty1TBn66hidknQKdNoHoY0oyW8n6EvkuF9O8WQqtPB1G qMXXIJkFbjgL4AQqpTlnvS1PoYBwv4oWlzAYJIXB5yKTUqKCD5efWRcFO8Dt4Qr7i6K8FE LD4C2yaDj6Bfei6hZC5mNbNQ5UGXzNxHp3Rf6MoTMIjg7VHe3H6Y4Q9ZQh3mHNfghy65gd I81G1tdMVlFYdLBuLCvrPwCSg/Kmp9GQlVFkI3P58C1lO3v1siYFO9PPalSVbhMrXTvQkS uk+IGTO7SLjfn96irTJwrPKxBRp8HD2IujOxTVk+JhNon/uUpz9Kc0sgAxTTSw== 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=1695416367; 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=MYL7R1Ico7AWa+D1FgzAp89Kwey4qNeGGFbfho9kcA8=; b=ouWIyon7gquyWDpvkw2Bd3I2CymCZ1Tw1X8Ses1mx/g/A1+ia+9qwtjPCN5YKH1cvb5oGe SER4cWtxg3gljcFqkZm/LmTc9xFLgbm8apPC6URJFhi/n3YNSLFxLefgo3nxhY7fE1B1on gntMOi5DSG++6lb/Q1aAJeIFkr2sn1Q1tHPN3mdBKrJRPgepgy1VeU7+XelNshyl8VELHT qiJRiveO51/05c5gQH3MY6UBsqzZLXBJhM/CEkysVpAWlurMAsTfm5TwSeE07qJlKAAO8O 91rr1FM2T6iJvi15LeCyUuVRSV5QKNYF1qoGE4y0qWI0+t6o0ns5RVjqAcc+Gw== 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 4Rsl4v3rsvzcRT; Fri, 22 Sep 2023 20:59:27 +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 38MKxRCD047266; Fri, 22 Sep 2023 20:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MKxRdk047263; Fri, 22 Sep 2023 20:59:27 GMT (envelope-from git) Date: Fri, 22 Sep 2023 20:59:27 GMT Message-Id: <202309222059.38MKxRdk047263@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 02cbc029dac9 - main - vfs: fix reference counting/locking on LK_UPGRADE error 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02cbc029dac936b4ddbc38cef969c4b30c9a7d1f Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=02cbc029dac936b4ddbc38cef969c4b30c9a7d1f commit 02cbc029dac936b4ddbc38cef969c4b30c9a7d1f Author: Olivier Certner AuthorDate: 2023-09-22 20:57:20 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-22 20:57:37 +0000 vfs: fix reference counting/locking on LK_UPGRADE error Factoring out this code unfortunately introduced reference and lock leaks in case of failure in the lock upgrade path under VV_CROSSLOCK. In terms of practical use, this impacts unionfs (and nullfs in a corner case). Fixes: 80bd5ef07025 ("vfs: factor out mount point traversal to a dedicated routine") MFC after: 3 days MFC to: stable/14 releng/14.0 Sponsored by: The FreeBSD Foundation Reviewed by: mjg [mjg: massaged the commit message a little bit] Differential Revision: https://reviews.freebsd.org/D41731 --- sys/kern/vfs_lookup.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 151253ffa0f5..d75351c34314 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -905,8 +905,15 @@ vfs_lookup_cross_mount(struct nameidata *ndp) crosslkflags |= LK_EXCLUSIVE | LK_CANRECURSE; } else if ((crosslkflags & LK_EXCLUSIVE) != 0) { error = vn_lock(dp, LK_UPGRADE); - if (error != 0) + if (error != 0) { + MPASS(error == ENOENT); + vrele(dp); + if (dp != ndp->ni_dvp) + vput(ndp->ni_dvp); + else + vrele(ndp->ni_dvp); break; + } if (dp->v_mountedhere != mp) { continue; }