diff options
| author | silby <silby@FreeBSD.org> | 2003-07-19 06:03:48 +0000 |
|---|---|---|
| committer | silby <silby@FreeBSD.org> | 2003-07-19 06:03:48 +0000 |
| commit | 4eaad33c828aa3c4da89e5e571e1c095f2e6c852 (patch) | |
| tree | 5c382f8d134f6a914a78d7fac82b8afe42c0932c /sys/kern/uipc_mbuf.c | |
| parent | 4d784158c5cbb77ca25b7aff4c286a9634a8c20a (diff) | |
| download | FreeBSD-src-4eaad33c828aa3c4da89e5e571e1c095f2e6c852.zip FreeBSD-src-4eaad33c828aa3c4da89e5e571e1c095f2e6c852.tar.gz | |
Three fixes:
- Make m_prepend use m_gethdr instead of m_get where
appropriate
- Make m_copym use m_gethdr instead of m_get where
appropriate
- Add a call to m_fixhdr in m_defrag; m_defrag can't
deal with corrupted pkthdr.len counts.
MFC after: 3 days
Diffstat (limited to 'sys/kern/uipc_mbuf.c')
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 25cd03f..c3e8856 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -160,7 +160,10 @@ m_prepend(struct mbuf *m, int len, int how) { struct mbuf *mn; - MGET(mn, how, m->m_type); + if (m->m_flags & M_PKTHDR) + MGETHDR(mn, how, m->m_type); + else + MGET(mn, how, m->m_type); if (mn == NULL) { m_freem(m); return (NULL); @@ -209,7 +212,10 @@ m_copym(struct mbuf *m, int off0, int len, int wait) ("m_copym, length > size of mbuf chain")); break; } - MGET(n, wait, m->m_type); + if (copyhdr) + MGETHDR(n, wait, m->m_type); + else + MGET(n, wait, m->m_type); *np = n; if (n == NULL) goto nospace; @@ -812,6 +818,8 @@ m_defrag(struct mbuf *m0, int how) if (!(m0->m_flags & M_PKTHDR)) return (m0); + m_fixhdr(m0); /* Needed sanity check */ + #ifdef MBUF_STRESS_TEST if (m_defragrandomfailures) { int temp = arc4random() & 0xff; |
