From 8ca00430023cd846ec4b67d76214dd42b8362d8e Mon Sep 17 00:00:00 2001
From: mav <mav@FreeBSD.org>
Date: Wed, 31 Mar 2010 20:37:44 +0000
Subject: Make ng_ppp fulfill upper protocol stack layers alignment
 requirements on platforms with strict alignment constraints. This fixes
 kernel panics on arm and probably other architectures.

PR:		sparc64/80410
---
 sys/netgraph/ng_ppp.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'sys/netgraph/ng_ppp.c')

diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c
index b2b0cb0..ec3ed82 100644
--- a/sys/netgraph/ng_ppp.c
+++ b/sys/netgraph/ng_ppp.c
@@ -907,7 +907,21 @@ ng_ppp_proto_recv(node_p node, item_p item, uint16_t proto, uint16_t linkNum)
 	const priv_p priv = NG_NODE_PRIVATE(node);
 	hook_p outHook = NULL;
 	int error;
+#ifdef ALIGNED_POINTER
+	struct mbuf *m, *n;
 
+	NGI_GET_M(item, m);
+	if (!ALIGNED_POINTER(mtod(m, caddr_t), uint32_t)) {
+		n = m_defrag(m, M_NOWAIT);
+		if (n == NULL) {
+			m_freem(m);
+			NG_FREE_ITEM(item);
+			return (ENOBUFS);
+		}
+		m = n;
+	}
+	NGI_M(item) = m;
+#endif /* ALIGNED_POINTER */
 	switch (proto) {
 	    case PROT_IP:
 		if (priv->conf.enableIP)
-- 
cgit v1.1