Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

src: Disable the M_PKTHDR check for now. It causes PR/53189 (whi...



details:   https://anonhg.NetBSD.org/src/rev/ac4e80bbf45b
branches:  trunk
changeset: 318254:ac4e80bbf45b
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon Apr 16 19:19:51 2018 +0000
description:
Disable the M_PKTHDR check for now. It causes PR/53189 (which is also
reproducible on i386).

It seems that someone is giving looutput a malformed chain.

diffstat:

 sys/kern/uipc_mbuf.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r aeeabf0d7f9a -r ac4e80bbf45b sys/kern/uipc_mbuf.c
--- a/sys/kern/uipc_mbuf.c      Mon Apr 16 17:32:34 2018 +0000
+++ b/sys/kern/uipc_mbuf.c      Mon Apr 16 19:19:51 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_mbuf.c,v 1.188 2018/04/15 07:35:49 maxv Exp $     */
+/*     $NetBSD: uipc_mbuf.c,v 1.189 2018/04/16 19:19:51 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.188 2018/04/15 07:35:49 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.189 2018/04/16 19:19:51 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mbuftrace.h"
@@ -1908,9 +1908,11 @@
                if (__predict_false(n->m_type == MT_FREE)) {
                        panic("%s: mbuf already freed (n = %p)", __func__, n);
                }
+#if 0  /* Causing PR/53189 */
                if (__predict_false((n != m) && (n->m_flags & M_PKTHDR) != 0)) {
                        panic("%s: M_PKTHDR set on secondary mbuf", __func__);
                }
+#endif
                if (__predict_false(n->m_nextpkt != NULL)) {
                        panic("%s: m_nextpkt not null (m_nextpkt = %p)",
                            __func__, n->m_nextpkt);



Home | Main Index | Thread Index | Old Index