svn commit: r363167 - head/sys/dev/cxgbe

[Navdeep Parhar]

Author: np
Date: Mon Jul 13 19:15:29 2020
New Revision: 363167
URL: https://svnweb.freebsd.org/changeset/base/363167

Log:
  cxgbev(4): Compare at most 16 bytes of the Ethernet header when trying
  to coalesce tx work requests.
  
  Note that Coverity will still treat this as an out-of-bounds access.  We
  do want to compare 16B starting from ethmacdst but cmp_l2hdr was was
  going beyond that by 2B.
  
  cmp_l2hdr was introduced in r362905.
  
  Reported by:	Coverity (CID 1430284)
  Sponsored by:	Chelsio Communications

Modified:
  head/sys/dev/cxgbe/t4_sge.c

Modified: head/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- head/sys/dev/cxgbe/t4_sge.c	Mon Jul 13 19:10:16 2020	(r363166)
+++ head/sys/dev/cxgbe/t4_sge.c	Mon Jul 13 19:15:29 2020	(r363167)
@@ -4700,6 +4700,8 @@ csum_to_ctrl(struct adapter *sc, struct mbuf *m)
 	return (ctrl);
 }
 
+#define VM_TX_L2HDR_LEN	16	/* ethmacdst to vlantci */
+
 /*
  * Write a VM txpkt WR for this packet to the hardware descriptors, update the
  * software descriptor, and advance the pidx.  It is guaranteed that enough
@@ -4748,7 +4750,7 @@ write_txpkt_vm_wr(struct adapter *sc, struct sge_txq *
 	 * conditional.  Also, it seems that we do not have to set
 	 * vlantci or fake the ethtype when doing VLAN tag insertion.
 	 */
-	m_copydata(m0, 0, sizeof(struct ether_header) + 2, wr->ethmacdst);
+	m_copydata(m0, 0, VM_TX_L2HDR_LEN, wr->ethmacdst);
 
 	if (needs_tso(m0)) {
 		struct cpl_tx_pkt_lso_core *lso = (void *)(wr + 1);
@@ -4985,10 +4987,10 @@ cmp_l2hdr(struct txpkts *txp, struct mbuf *m)
 	int len;
 
 	MPASS(txp->npkt > 0);
-	MPASS(m->m_len >= 16);	/* type1 implies 1 GL with all of the frame. */
+	MPASS(m->m_len >= VM_TX_L2HDR_LEN);
 
 	if (txp->ethtype == be16toh(ETHERTYPE_VLAN))
-		len = sizeof(struct ether_vlan_header);
+		len = VM_TX_L2HDR_LEN;
 	else
 		len = sizeof(struct ether_header);
 
@@ -4998,9 +5000,9 @@ cmp_l2hdr(struct txpkts *txp, struct mbuf *m)
 static inline void
 save_l2hdr(struct txpkts *txp, struct mbuf *m)
 {
-	MPASS(m->m_len >= 16);	/* type1 implies 1 GL with all of the frame. */
+	MPASS(m->m_len >= VM_TX_L2HDR_LEN);
 
-	memcpy(&txp->ethmacdst[0], mtod(m, const void *), 16);
+	memcpy(&txp->ethmacdst[0], mtod(m, const void *), VM_TX_L2HDR_LEN);
 }
 
 static int