D44931.diff
No OneTemporary
Actions

Size

927 B

Referenced Files

None

Subscribers

None

D44931.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
	@@ -86,6 +86,11 @@
	ndp->ni_cnd.cn_flags \|= ISRESTARTED; \
	} while (0)

	+#define NI_CAP_VIOLATION(ndp, path) do { \
	+ ktrcapfail(CAPFAIL_NAMEI, (path)); \
	+ (ndp)->ni_lcf &= ~NI_LCF_KTR_FLAGS; \
	+} while (0)
	+
	SDT_PROVIDER_DEFINE(vfs);
	SDT_PROBE_DEFINE4(vfs, namei, lookup, entry, "struct vnode ", "char ",
	"unsigned long", "bool");
	diff --git a/sys/sys/namei.h b/sys/sys/namei.h
	--- a/sys/sys/namei.h
	+++ b/sys/sys/namei.h
	@@ -205,11 +205,6 @@
	#define NI_LCF_CAP_DOTDOT_KTR 0x0008 /* ".." in strictrelative case */
	#define NI_LCF_KTR_FLAGS (NI_LCF_STRICTREL_KTR \| NI_LCF_CAP_DOTDOT_KTR)

	-#define NI_CAP_VIOLATION(ndp, path) do { \
	- ktrcapfail(CAPFAIL_NAMEI, (path)); \
	- (ndp)->ni_lcf &= ~NI_LCF_KTR_FLAGS; \
	-} while (0)
	-
	/*
	* Initialization of a nameidata structure.
	*/