Date: Sat, 31 Mar 2018 17:28:48 +0000 From: Phabricator <phabric-noreply@FreeBSD.org> To: freebsd-net@freebsd.org Subject: [Differential] D4090: mbuf(9): unbreak m_fragment() Message-ID: <f07de0dd928626a6400f951a70c9fa87@localhost.localdomain> In-Reply-To: <differential-rev-PHID-DREV-ox23emfuvv73okywt65z-req@FreeBSD.org> References: <differential-rev-PHID-DREV-ox23emfuvv73okywt65z-req@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] This revision was automatically updated to reflect the committed changes. Closed by commit rS331847: MFC r324673: (authored by avos). CHANGED PRIOR TO COMMIT https://reviews3.freebsd.org/D4090?vs=9973&id=25847#toc REPOSITORY rS FreeBSD src repository CHANGES SINCE LAST UPDATE https://reviews3.freebsd.org/D4090?vs=9973&id=25847 REVISION DETAIL https://reviews3.freebsd.org/D4090 AFFECTED FILES stable/11 stable/11/sys/kern/uipc_mbuf.c EMAIL PREFERENCES https://reviews3.freebsd.org/settings/panel/emailpreferences/ To: s3erios_gmail.com, adrian, glebius, freebsd-net-list Cc: imp [-- Attachment #2 --] diff --git a/stable/11 b/stable/11 diff --git a/stable/11/sys/kern/uipc_mbuf.c b/stable/11/sys/kern/uipc_mbuf.c --- a/stable/11/sys/kern/uipc_mbuf.c +++ b/stable/11/sys/kern/uipc_mbuf.c @@ -1439,62 +1439,59 @@ struct mbuf * m_fragment(struct mbuf *m0, int how, int length) { - struct mbuf *m_new = NULL, *m_final = NULL; - int progress = 0; + struct mbuf *m_first, *m_last; + int divisor = 255, progress = 0, fraglen; if (!(m0->m_flags & M_PKTHDR)) return (m0); - if ((length == 0) || (length < -2)) + if (length == 0 || length < -2) return (m0); + if (length > MCLBYTES) + length = MCLBYTES; + if (length < 0 && divisor > MCLBYTES) + divisor = MCLBYTES; + if (length == -1) + length = 1 + (arc4random() % divisor); + if (length > 0) + fraglen = length; m_fixhdr(m0); /* Needed sanity check */ - m_final = m_getcl(how, MT_DATA, M_PKTHDR); - - if (m_final == NULL) + m_first = m_getcl(how, MT_DATA, M_PKTHDR); + if (m_first == NULL) goto nospace; - if (m_dup_pkthdr(m_final, m0, how) == 0) + if (m_dup_pkthdr(m_first, m0, how) == 0) goto nospace; - m_new = m_final; + m_last = m_first; - if (length == -1) - length = 1 + (arc4random() & 255); - while (progress < m0->m_pkthdr.len) { - int fraglen; - - if (length > 0) - fraglen = length; - else - fraglen = 1 + (arc4random() & 255); + if (length == -2) + fraglen = 1 + (arc4random() % divisor); if (fraglen > m0->m_pkthdr.len - progress) fraglen = m0->m_pkthdr.len - progress; - if (fraglen > MCLBYTES) - fraglen = MCLBYTES; - - if (m_new == NULL) { - m_new = m_getcl(how, MT_DATA, 0); + if (progress != 0) { + struct mbuf *m_new = m_getcl(how, MT_DATA, 0); if (m_new == NULL) goto nospace; + + m_last->m_next = m_new; + m_last = m_new; } - m_copydata(m0, progress, fraglen, mtod(m_new, caddr_t)); + m_copydata(m0, progress, fraglen, mtod(m_last, caddr_t)); progress += fraglen; - m_new->m_len = fraglen; - if (m_new != m_final) - m_cat(m_final, m_new); - m_new = NULL; + m_last->m_len = fraglen; } m_freem(m0); - m0 = m_final; + m0 = m_first; return (m0); nospace: - if (m_final) - m_freem(m_final); + if (m_first) + m_freem(m_first); /* Return the original chain on failure */ return (m0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?f07de0dd928626a6400f951a70c9fa87>