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

Fix m_prepend(). If 'm' is not a pkthdr, it doesn't make sense to use 

MH_ALIGN, it should rather be M_ALIGN.

I'm wondering whether there should not be a KASSERT to make sure 'm' is
always a pkthdr.
This commit is contained in:
maxv 2018-01-22 07:22:52 +00:00
parent b51dc2b6f2
commit b087ec3d16
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/kern/uipc_mbuf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uipc_mbuf.c,v 1.177 2018/01/14 16:59:37 maxv Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.178 2018/01/22 07:22:52 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.177 2018/01/14 16:59:37 maxv Exp $");
__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.178 2018/01/22 07:22:52 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbuftrace.h"
@ -666,6 +666,7 @@ m_prepend(struct mbuf *m, int len, int how)
m_freem(m);
return (NULL);
}
if (m->m_flags & M_PKTHDR) {
M_MOVE_PKTHDR(mn, m);
} else {
@ -673,8 +674,15 @@ m_prepend(struct mbuf *m, int len, int how)
}
mn->m_next = m;
m = mn;
if (len < MHLEN)
MH_ALIGN(m, len);
if (m->m_flags & M_PKTHDR) {
if (len < MHLEN)
MH_ALIGN(m, len);
} else {
if (len < MLEN)
M_ALIGN(m, len);
}
m->m_len = len;
return (m);
}