D39773.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39773.diff
View Options

	diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
	--- a/sys/kern/vfs_lookup.c
	+++ b/sys/kern/vfs_lookup.c
	@@ -1083,12 +1083,16 @@
	pr = pr->pr_parent)
	if (dp == pr->pr_root)
	break;
	- if (dp == ndp->ni_rootdir \|\|
	- dp == ndp->ni_topdir \|\|
	- dp == rootvnode \|\|
	- pr != NULL \|\|
	- ((dp->v_vflag & VV_ROOT) != 0 &&
	- (cnp->cn_flags & NOCROSSMOUNT) != 0)) {
	+ bool isroot = dp == ndp->ni_rootdir \|\|
	+ dp == ndp->ni_topdir \|\| dp == rootvnode \|\|
	+ pr != NULL;
	+ if (isroot && (ndp->ni_lcf &
	+ NI_LCF_STRICTRELATIVE) != 0) {
	+ error = ENOTCAPABLE;
	+ goto capdotdot;
	+ }
	+ if (isroot \|\| ((dp->v_vflag & VV_ROOT) != 0 &&
	+ (cnp->cn_flags & NOCROSSMOUNT) != 0)) {
	ndp->ni_dvp = dp;
	ndp->ni_vp = dp;
	VREF(dp);
	@@ -1109,6 +1113,7 @@
	LK_RETRY, ISDOTDOT));
	error = nameicap_check_dotdot(ndp, dp);
	if (error != 0) {
	+capdotdot:
	#ifdef KTRACE
	if (KTRPOINT(curthread, KTR_CAPFAIL))
	ktrcapfail(CAPFAIL_LOOKUP, NULL, NULL);