aboutsummaryrefslogtreecommitdiff
path: root/sys/netpfil
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2021-03-23 13:38:59 +0000
committerMark Johnston <markj@FreeBSD.org>2021-03-28 00:23:57 +0000
commit41a8dc361969629706827fb867cedaec3c270e68 (patch)
treed6f222c784c822aeea6f9a213af7350f3c9ce7dc /sys/netpfil
parent85ad493677a28725505834f61f7ba2230bbb19b3 (diff)
downloadsrc-41a8dc361969629706827fb867cedaec3c270e68.tar.gz
src-41a8dc361969629706827fb867cedaec3c270e68.zip
pf: Handle unmapped mbufs when computing checksums
PR: 254419 Reviewed by: gallatin, kp Tested by: Igor A. Valkov <viaprog@gmail.com> Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29378 (cherry picked from commit b93a796b06ec013a75a08ac43d8acf6aa94aa970)
Diffstat (limited to 'sys/netpfil')
-rw-r--r--sys/netpfil/pf/pf.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 2757bf9cdc54..46731cbf9ee1 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -5571,11 +5571,17 @@ pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp,
/* Copied from FreeBSD 10.0-CURRENT ip_output. */
m0->m_pkthdr.csum_flags |= CSUM_IP;
if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {
+ m0 = mb_unmapped_to_ext(m0);
+ if (m0 == NULL)
+ goto done;
in_delayed_cksum(m0);
m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
}
#if defined(SCTP) || defined(SCTP_SUPPORT)
if (m0->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) {
+ m0 = mb_unmapped_to_ext(m0);
+ if (m0 == NULL)
+ goto done;
sctp_delayed_cksum(m0, (uint32_t)(ip->ip_hl << 2));
m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;
}
@@ -5752,6 +5758,9 @@ pf_route6(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp,
if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6 &
~ifp->if_hwassist) {
uint32_t plen = m0->m_pkthdr.len - sizeof(*ip6);
+ m0 = mb_unmapped_to_ext(m0);
+ if (m0 == NULL)
+ goto done;
in6_delayed_cksum(m0, plen, sizeof(struct ip6_hdr));
m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA_IPV6;
}