The branch main has been updated by mjg:
URL:
https://cgit.FreeBSD.org/src/commit/?id=8cbd164a179c182e8fd4a71f366bc48fe840eafb
commit 8cbd164a179c182e8fd4a71f366bc48fe840eafb
Author: Mateusz Guzik <m...@freebsd.org>
AuthorDate: 2021-01-26 22:14:49 +0000
Commit: Mateusz Guzik <m...@freebsd.org>
CommitDate: 2021-01-31 12:02:46 +0000
cache: handle NOFOLLOW requests for symlinks
Tested by: pho
---
sys/kern/vfs_cache.c | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index ff8aad14001b..b8b876657211 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -4307,11 +4307,22 @@ cache_fplookup_final_modifying(struct cache_fpl *fpl)
}
/*
- * Check if the target is either a symlink or a mount point.
- * Since we expect this to be the terminal vnode it should
- * almost never be true.
+ * If they want the symlink itself we are fine, but if they want to
+ * follow it regular lookup has to be engaged.
*/
- if (__predict_false(tvp->v_type == VLNK || cache_fplookup_is_mp(fpl))) {
+ if (tvp->v_type == VLNK) {
+ if ((cnp->cn_flags & FOLLOW) != 0) {
+ vput(dvp);
+ vput(tvp);
+ return (cache_fpl_aborted(fpl));
+ }
+ }
+
+ /*
+ * Since we expect this to be the terminal vnode it should almost never
+ * be a mount point.
+ */
+ if (__predict_false(cache_fplookup_is_mp(fpl))) {
vput(dvp);
vput(tvp);
return (cache_fpl_aborted(fpl));
@@ -4614,7 +4625,15 @@ cache_fplookup_noentry(struct cache_fpl *fpl)
return (cache_fpl_handled(fpl));
}
- if (__predict_false(tvp->v_type == VLNK || cache_fplookup_is_mp(fpl))) {
+ if (tvp->v_type == VLNK) {
+ if ((cnp->cn_flags & FOLLOW) != 0) {
+ vput(dvp);
+ vput(tvp);
+ return (cache_fpl_aborted(fpl));
+ }
+ }
+
+ if (__predict_false(cache_fplookup_is_mp(fpl))) {
vput(dvp);
vput(tvp);
return (cache_fpl_aborted(fpl));
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
