git: c16c4ea6d399 - main - vfs cache: return ENOTDIR for not_a_dir/{.,..} lookups

[Mateusz Guzik]

The branch main has been updated by mjg:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=c16c4ea6d399332d4a023df6e423be61fdb875a5
commit c16c4ea6d399332d4a023df6e423be61fdb875a5
Author:     Mateusz Guzik <m...@freebsd.org>
AuthorDate: 2023-03-23 19:19:48 +0000
Commit:     Mateusz Guzik <m...@freebsd.org>
CommitDate: 2023-03-23 19:31:18 +0000

    vfs cache: return ENOTDIR for not_a_dir/{.,..} lookups
    
    Reported by:    Oliver Kiddle
    PR:     270419
    MFC:    3 days
---
 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 3ae2b663fffb..e716113e6085 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -5065,6 +5065,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
@@ -5127,6 +5133,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));