Module Name: src Committed By: maxv Date: Tue Apr 17 07:41:34 UTC 2018
Modified Files: src/sys/kern: uipc_mbuf.c Log Message: If the mbuf is shared leave M_PKTHDR in place. Given where this function is called from that's not supposed to happen, but I'm growing unconfident about our mbuf code. To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.190 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.189 src/sys/kern/uipc_mbuf.c:1.190 --- src/sys/kern/uipc_mbuf.c:1.189 Mon Apr 16 19:19:51 2018 +++ src/sys/kern/uipc_mbuf.c Tue Apr 17 07:41:34 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_mbuf.c,v 1.189 2018/04/16 19:19:51 maxv Exp $ */ +/* $NetBSD: uipc_mbuf.c,v 1.190 2018/04/17 07:41:34 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.189 2018/04/16 19:19:51 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.190 2018/04/17 07:41:34 maxv Exp $"); #ifdef _KERNEL_OPT #include "opt_mbuftrace.h" @@ -460,6 +460,11 @@ m_pkthdr_remove(struct mbuf *m) { KASSERT(m->m_flags & M_PKTHDR); + if (M_READONLY(m)) { + /* Nothing we can do. */ + return; + } + m_tag_delete_chain(m, NULL); m->m_flags &= ~M_PKTHDR; memset(&m->m_pkthdr, 0, sizeof(m->m_pkthdr));