Author: hselasky
Date: Thu Jun 18 10:41:51 2020
New Revision: 362313
URL: https://svnweb.freebsd.org/changeset/base/362313
Log:
MFC r362045:
Make sure packets generated by raw IP code is let through by mlx5en(4).
Allow the TCP header to reside in the mbuf following the IP header.
Else such packets will get dropped.
Backtrace:
mlx5e_sq_xmit()
mlx5e_xmit()
ether_output_frame()
ether_output()
ip_output_send()
ip_output()
rip_output()
sosend_generic()
sosend()
kern_sendit()
sendit()
sys_sendto()
amd64_syscall()
fast_syscall_common()
Sponsored by: Mellanox Technologies
Modified:
stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
==============================================================================
--- stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c Thu Jun 18 10:40:16 2020
(r362312)
+++ stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c Thu Jun 18 10:41:51 2020
(r362313)
@@ -228,9 +228,15 @@ mlx5e_get_header_size(const struct mbuf *mb)
default:
return (0);
}
- if (unlikely(mb->m_len < eth_hdr_len + sizeof(*th)))
- return (0);
- th = (const struct tcphdr *)(mb->m_data + eth_hdr_len);
+ if (unlikely(mb->m_len < eth_hdr_len + sizeof(*th))) {
+ const struct mbuf *m_th = mb->m_next;
+ if (unlikely(mb->m_len != eth_hdr_len ||
+ m_th == NULL || m_th->m_len < sizeof(*th)))
+ return (0);
+ th = (const struct tcphdr *)(m_th->m_data);
+ } else {
+ th = (const struct tcphdr *)(mb->m_data + eth_hdr_len);
+ }
tcp_hlen = th->th_off << 2;
eth_hdr_len += tcp_hlen;
/*
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
