diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2023-03-23 19:19:48 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2023-03-23 20:22:20 +0000 |
| commit | 276e405a50d36229df308642b30e6e66372d39f2 (patch) | |
| tree | 2d736b02ab2f7fa499c58e2db8a39de3e6ea6864 | |
| parent | d08ffbd70e7245f94af4b103f64c7ecab6da9d7f (diff) | |
| download | src-276e405a50d36229df308642b30e6e66372d39f2.tar.gz src-276e405a50d36229df308642b30e6e66372d39f2.zip | |
vfs cache: return ENOTDIR for not_a_dir/{.,..} lookups
Reported by: Oliver Kiddle
PR: 270419
MFC: 3 days
Approved by: re (gjb)
(cherry picked from commit c16c4ea6d399332d4a023df6e423be61fdb875a5)
(cherry picked from commit 5d83656c09f522d6bf4f1050be60f270ddef04af)
| -rw-r--r-- | sys/kern/vfs_cache.c | 11 |
1 files changed, 11 insertions, 0 deletions
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)); |