Module Name: src
Committed By: maxv
Date: Fri Apr 27 06:15:49 UTC 2018
Modified Files:
src/sys/kern: uipc_mbuf.c
Log Message:
Panic in m_copypacket if no header is present, that's a requirement.
To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 src/sys/kern/uipc_mbuf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.197 src/sys/kern/uipc_mbuf.c:1.198
--- src/sys/kern/uipc_mbuf.c:1.197 Thu Apr 26 19:13:34 2018
+++ src/sys/kern/uipc_mbuf.c Fri Apr 27 06:15:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.197 2018/04/26 19:13:34 maxv Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.198 2018/04/27 06:15:49 maxv Exp $ */
/*
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.197 2018/04/26 19:13:34 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.198 2018/04/27 06:15:49 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@@ -836,6 +836,10 @@ m_copypacket(struct mbuf *m, int how)
{
struct mbuf *top, *n, *o;
+ if (__predict_false((m->m_flags & M_PKTHDR) == 0)) {
+ panic("%s: no header (m = %p)", __func__, m);
+ }
+
n = m_get(how, m->m_type);
top = n;
if (!n)
