From nobody Thu Mar 23 19:59:23 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 4PjGQ547x5z41kSl; Thu, 23 Mar 2023 19:59:25 +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 4PjGQ52ZzTz3xtH; Thu, 23 Mar 2023 19:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679601565; 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=bQdu/xMVz+Kdl+BFlwbODr4NtzlzNkKRVzakO0VwaSw=; b=cg0SMjO5wmsUY15pBCHnzo5pKRtwlir3ZOlbLx7PKlzidOo6UPJ4S1W6DBTex6rjN8LU1Y cYupYDR6grtq1PkHssteJmpgOYCBo9P/ccItm8EDEKVN8vMSVG2dCnQ50SK5kT1LhG78Ak Hqpa/LgIhy6ADEX7IZ2+bqiur8IIvveL8Anj6bxEzlJa19TGDGQtuJMVNmJg/9xkoJfj2+ JTozpJbMfJtHdGyGx/ckGqBVoCQD3YklR1vxnmhAAUeym5wZTQlh4tPW1pAWUn0LpzqM4m xeXLt5kX2AMHhpC1QfJ9UlTgUF+5uc/7HJGY96oxGUEGDVvguhzAxH7ojBkHpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679601565; 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=bQdu/xMVz+Kdl+BFlwbODr4NtzlzNkKRVzakO0VwaSw=; b=tXdM7wz8N+PdPt5kk3r5JL0IWNBhBZn8zeV8obpY/EtK98oGfkeCI9X1uwdhfSTjfU4Ht9 li9fVnd9U+SU387aIOSprTN5tl8WlDVl0fcF1RVixuEsmChutP0jb+ytHGuF8VNZzyzX9M KdKw1irj/uRxEj/giU4yucTmptJsvZiftPQ8PY/NvwDwN55JxChyrDD/1htwJns7ZcRzAu L0StO+5RFsQNuBNSO21QiWsatyYD15IsCqG2Tfd91iXUwGVCHM6sNPxSZ8DtXo/h4zytmU Uo42Ibogdk1TFFUuHI7LPetBSSX7oidu7KH9iXO9wcjxoisVvenEqGU9xp7/+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679601565; a=rsa-sha256; cv=none; b=slVHNsOExSLofsKctSVmPG4h0uXis97ORzul4Hg7pkb7IukeIzlIe5izHxwuqHPIbmNMxI wK+izjN0qUhyTVkialCrQ6uVrQjCowHmYJnQc1u6sVS55DL5Be/w/KzshBkZy7h/3xlrw3 fxJezfpZJrI8/cQBaCq5jL23bko4LecsgyN3W/ryUNYLccESH8VTReh4mrSNHFjFeBvrEz PToFZgQ9APH0VNb96fsc+VWlCpSCN2CEAePbibrGSVTNP4+yy7VU2h4WI3uDcozisEgIVx 25gvtPfDa/DmIHIex+4D13OZYmigLCAZwqLwp5buOrzobwdBqn60xIMlPLbkBQ== 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 4PjGQ51dGkzpp9; Thu, 23 Mar 2023 19:59:23 +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 32NJxNjt021426; Thu, 23 Mar 2023 19:59:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NJxNC9021425; Thu, 23 Mar 2023 19:59:23 GMT (envelope-from git) Date: Thu, 23 Mar 2023 19:59:23 GMT Message-Id: <202303231959.32NJxNC9021425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 5d83656c09f5 - stable/13 - vfs cache: return ENOTDIR for not_a_dir/{.,..} lookups 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5d83656c09f522d6bf4f1050be60f270ddef04af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5d83656c09f522d6bf4f1050be60f270ddef04af commit 5d83656c09f522d6bf4f1050be60f270ddef04af Author: Mateusz Guzik AuthorDate: 2023-03-23 19:19:48 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-23 19:59:08 +0000 vfs cache: return ENOTDIR for not_a_dir/{.,..} lookups Reported by: Oliver Kiddle PR: 270419 MFC: 3 days (cherry picked from commit c16c4ea6d399332d4a023df6e423be61fdb875a5) --- sys/kern/vfs_cache.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index e87f4a6cda1a..2b07dbbc34f0 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5075,6 +5075,12 @@ cache_fplookup_dot(struct cache_fpl *fpl) int error; MPASS(!seqc_in_modify(fpl->dvp_seqc)); + + if (__predict_false(fpl->dvp->v_type != VDIR)) { + cache_fpl_smr_exit(fpl); + return (cache_fpl_handled_error(fpl, ENOTDIR)); + } + /* * Just re-assign the value. seqc will be checked later for the first * non-dot path component in line and/or before deciding to return the @@ -5137,6 +5143,11 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) return (cache_fpl_partial(fpl)); } + if (__predict_false(dvp->v_type != VDIR)) { + cache_fpl_smr_exit(fpl); + return (cache_fpl_handled_error(fpl, ENOTDIR)); + } + ncp = atomic_load_consume_ptr(&dvp->v_cache_dd); if (ncp == NULL) { return (cache_fpl_aborted(fpl));