Attachment 240668 Details for Bug 268400 – workaround

[patch] workaround

diff (text/plain), 1.08 KB, created by Mark Johnston on 2023-03-08 15:59:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Johnston

Created: 2023-03-08 15:59:46 UTC

Size: 1.08 KB

patch

obsolete

>commit f6d352854fb2b89dbcfb9e840dbd1db2098eeb6e
>Author: Mark Johnston <markj@FreeBSD.org>
>Date:   Wed Mar 8 10:48:37 2023 -0500
>
>    icmp6: Hack to handle unmapped mbufs
>    
>    The real solution is to make in6_cksum() handle unmapped mbufs.
>
>diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
>index 5c94a0c56be1..7c276644f23e 100644
>--- a/sys/netinet6/icmp6.c
>+++ b/sys/netinet6/icmp6.c
>@@ -2118,6 +2118,10 @@ icmp6_reflect(struct mbuf *m, size_t off)
> 	ip6->ip6_nxt = IPPROTO_ICMPV6;
> 	ip6->ip6_hlim = hlim;
> 
>+	/* XXX-MJ in6_cksum() does not yet handle unmapped mbufs */
>+	m = mb_unmapped_to_ext(m);
>+	if (m == NULL)
>+		goto bad;
> 	icmp6->icmp6_cksum = 0;
> 	icmp6->icmp6_cksum = in6_cksum(m, IPPROTO_ICMPV6,
> 	    sizeof(struct ip6_hdr), plen);
>@@ -2613,6 +2617,10 @@ noredhdropt:;
> 
> 	ip6->ip6_plen = htons(m->m_pkthdr.len - sizeof(struct ip6_hdr));
> 
>+	/* XXX-MJ in6_cksum() does not yet handle unmapped mbufs */
>+	m = mb_unmapped_to_ext(m);
>+	if (m == NULL)
>+		goto fail;
> 	nd_rd->nd_rd_cksum = 0;
> 	nd_rd->nd_rd_cksum = in6_cksum(m, IPPROTO_ICMPV6,
> 	    sizeof(*ip6), ntohs(ip6->ip6_plen));

Actions: View | Diff

Attachments on bug 268400: 238823 | 240668 | 242830 | 242831 | 242832