D46684.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D46684.diff
View Options

	diff --git a/sys/sys/kassert.h b/sys/sys/kassert.h
	--- a/sys/sys/kassert.h
	+++ b/sys/sys/kassert.h
	@@ -144,9 +144,12 @@
	if (__predict_false(!(exp))) \
	kassert_panic msg; \
	} while (0)
	+#define KASSERTE(exp, msg) \
	+ ((__predict_false(!(exp))) ? (kassert_panic msg) : (void)0)
	#else /* !(KERNEL && INVARIANTS) && !_STANDALONE */
	#define KASSERT(exp,msg) do { \
	} while (0)
	+#define KASSERTE(exp, msg) ((void)0)
	#endif /* (_KERNEL && INVARIANTS) \|\| _STANDALONE */

	#ifdef _KERNEL
	diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
	--- a/sys/sys/mbuf.h
	+++ b/sys/sys/mbuf.h
	@@ -105,8 +105,22 @@
	* mtod(m, t) -- Convert mbuf pointer to data pointer of correct type.
	* mtodo(m, o) -- Same as above but with offset 'o' into data.
	*/
	-#define mtod(m, t) ((t)((m)->m_data))
	-#define mtodo(m, o) ((void *)(((m)->m_data) + (o)))
	+#define mtod(m, t) ( \
	+ KASSERTE((m)->m_len >= sizeof(*((t)((m)->m_data))), \
	+ ("%s: mtod_(): m_len=%d < %zu of expected data len @ %s:%d",\
	+ __func__, (m)->m_len, sizeof(*((t)((m)->m_data))), \
	+ __FILE__, __LINE__)) \
	+ , \
	+ ((t)((m)->m_data)) \
	+)
	+#define mtodo(m, o) ( \
	+ KASSERTE((m)->m_len >= (o) + 1, \
	+ ("%s: mtodo_(): m_len=%d < %zu of expected data len @ %s:%d",\
	+ __func__, (m)->m_len, (size_t)((o) + 1), \
	+ __FILE__, __LINE__)) \
	+ , \
	+ ((void *)(((m)->m_data) + (o))) \
	+)

	/*
	* Argument structure passed to UMA routines during mbuf and packet