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

m_cat() - if it is safe, copy data portion into 1st mbuf even if 1st mbuf

Browse Source 
is M_EXT mbuf.
This commit is contained in:
itojun 2004-02-26 02:30:04 +00:00
parent 5f588e21c2
commit efcd57f822
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.76 2004/01/21 02:11:20 atatat Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.77 2004/02/26 02:30:04 itojun 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.76 2004/01/21 02:11:20 atatat Exp $");
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.77 2004/02/26 02:30:04 itojun Exp $");
#include "opt_mbuftrace.h"
@ -679,8 +679,7 @@ m_cat(struct mbuf *m, struct mbuf *n)
while (m->m_next)
m = m->m_next;
while (n) {
if (m->m_flags & M_EXT ||
m->m_data + m->m_len + n->m_len >= &m->m_dat[MLEN]) {
if (M_READONLY(m) || n->m_len > M_TRAILINGSPACE(m)) {
/* just join the two chains */
m->m_next = n;
return;