Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m_cat: assert mbuf types only when coalescing them by copying. 

mbuf n often have 0-sized "headers" and their types don't matter much.

PR/24713 from Darrin B. Jewell.
This commit is contained in:
yamt 2004-03-09 06:37:59 +00:00
parent a8d81512fb
commit cd9b5b72f5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/uipc_mbuf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_mbuf.c,v 1.77 2004/02/26 02:30:04 itojun Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.78 2004/03/09 06:37:59 yamt Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.77 2004/02/26 02:30:04 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.78 2004/03/09 06:37:59 yamt Exp $");
#include "opt_mbuftrace.h"
@ -674,8 +674,6 @@ void
m_cat(struct mbuf *m, struct mbuf *n)
{
KASSERT(n == NULL || m->m_type == n->m_type);
while (m->m_next)
m = m->m_next;
while (n) {
@ -684,6 +682,7 @@ m_cat(struct mbuf *m, struct mbuf *n)
m->m_next = n;
return;
}
KASSERT(n->m_len == 0 || m->m_type == n->m_type);
/* splat the data from one into the other */
memcpy(mtod(m, caddr_t) + m->m_len, mtod(n, caddr_t),
(u_int)n->m_len);