Module Name: src
Committed By: maxv
Date: Mon Jan 22 07:11:45 UTC 2018
Modified Files:
src/sys/sys: mbuf.h
Log Message:
Add KASSERTs in *_ALIGN: ensure the mbuf is of the correct type, and
also make sure m->m_data points at the beginning of the mbuf.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/sys/mbuf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.174 src/sys/sys/mbuf.h:1.175
--- src/sys/sys/mbuf.h:1.174 Sun Jan 14 17:16:58 2018
+++ src/sys/sys/mbuf.h Mon Jan 22 07:11:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.174 2018/01/14 17:16:58 maxv Exp $ */
+/* $NetBSD: mbuf.h,v 1.175 2018/01/22 07:11:45 maxv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -604,6 +604,8 @@ do { \
*/
#define M_ALIGN(m, len) \
do { \
+ KASSERT(((m)->m_flags & (M_PKTHDR|M_EXT)) == 0); \
+ KASSERT(M_LEADINGSPACE(m) == 0); \
(m)->m_data += (MLEN - (len)) &~ (sizeof(long) - 1); \
} while (/* CONSTCOND */ 0)
@@ -613,6 +615,9 @@ do { \
*/
#define MH_ALIGN(m, len) \
do { \
+ KASSERT(((m)->m_flags & M_PKTHDR) != 0); \
+ KASSERT(((m)->m_flags & M_EXT) == 0); \
+ KASSERT(M_LEADINGSPACE(m) == 0); \
(m)->m_data += (MHLEN - (len)) &~ (sizeof(long) - 1); \
} while (/* CONSTCOND */ 0)
